kernel: update ssb and bcma to linux-next next-20110628

[openwrt.git] / target / linux / generic / config-2.6.37

diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37
index 9492947..8719e52 100644 (file)
--- a/target/linux/generic/config-2.6.37
+++ b/target/linux/generic/config-2.6.37
@@ -181,7 +181,7 @@ CONFIG_BASE_SMALL=0
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_BITREVERSE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_BITREVERSE=y

-# CONFIG_BKL is not set
+CONFIG_BKL=y

 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_CPQ_DA is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_CPQ_DA is not set
 CONFIG_BLK_DEV=y


@@ -374,6 +374,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CONNECTOR is not set
 CONFIG_CONSTRUCTORS=y
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_CONSTRUCTORS=y
 # CONFIG_CONTEXT_SWITCH_TRACER is not set

+# CONFIG_COPS is not set

 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_FREQ is not set


@@ -858,6 +859,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_SIMTEC is not set

+# CONFIG_I2C_SCMI is not set

 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set


@@ -886,6 +888,7 @@ CONFIG_HZ_100=y
 # CONFIG_IDE_PHISON is not set
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IDE_PHISON is not set
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set

+# CONFIG_IDEAPAD_LAPTOP is not set

 # CONFIG_IEEE1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set
 # CONFIG_IEEE1394_ETH1394 is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set
 # CONFIG_IEEE1394_ETH1394 is not set


@@ -1344,6 +1347,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set

+# CONFIG_MOUSE_GPIO is not set

 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set


@@ -2283,6 +2287,7 @@ CONFIG_SLABINFO=y
 # CONFIG_SND_ALS300 is not set
 # CONFIG_SND_ALS4000 is not set
 # CONFIG_SND_ARM is not set
 # CONFIG_SND_ALS300 is not set
 # CONFIG_SND_ALS4000 is not set
 # CONFIG_SND_ARM is not set

+# CONFIG_SND_ASIHPI is not set

 # CONFIG_SND_ATIIXP is not set
 # CONFIG_SND_ATIIXP_MODEM is not set
 # CONFIG_SND_ATMEL_AC97C is not set
 # CONFIG_SND_ATIIXP is not set
 # CONFIG_SND_ATIIXP_MODEM is not set
 # CONFIG_SND_ATMEL_AC97C is not set


@@ -2343,6 +2348,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_INTERWAVE is not set
 # CONFIG_SND_INTERWAVE_STB is not set
 # CONFIG_SND_ISA is not set
 # CONFIG_SND_INTERWAVE is not set
 # CONFIG_SND_INTERWAVE_STB is not set
 # CONFIG_SND_ISA is not set

+# CONFIG_SND_KIRKWOOD_SOC is not set

 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LAYLA20 is not set
 # CONFIG_SND_LAYLA24 is not set
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LAYLA20 is not set
 # CONFIG_SND_LAYLA24 is not set