update 2.6.27 specific patches, and sync kernel config

SVN-Revision: 13196
owl
Gabor Juhos 2008-11-13 14:28:09 +00:00
parent 1af7fe6e24
commit f76bec1452
2 changed files with 2 additions and 5 deletions

View File

@ -212,9 +212,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SMSC_PHY is not set
# CONFIG_SND_MIPS is not set
# CONFIG_SND_SPI is not set
CONFIG_SND_USB=y
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -77,6 +77,11 @@ config MVSWITCH_PHY
@@ -83,6 +83,11 @@ config MVSWITCH_PHY
---help---
Currently supports the Marvell 88E6060 switch.
@ -14,7 +14,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_ICPLUS_PHY) += icplus.o
@@ -16,6 +16,7 @@ obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o