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

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

diff --git a/target/linux/generic/config-2.6.39 b/target/linux/generic/config-2.6.39
index db276f1..0dceb01 100644 (file)
--- a/target/linux/generic/config-2.6.39
+++ b/target/linux/generic/config-2.6.39
@@ -99,6 +99,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_UNWIND is not set
 CONFIG_ARPD=y
 # CONFIG_ARTHUR is not set
@@ -178,6 +179,8 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
 # CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCMA is not set
+CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BE2ISCSI is not set
@@ -1326,6 +1329,7 @@ CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MC13783 is not set
 # CONFIG_MFD_MC13XXX is not set
@@ -2632,6 +2636,8 @@ CONFIG_TMPFS=y
 # CONFIG_TOUCHSCREEN_AD7879_I2C is not set
 # CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
@@ -2645,11 +2651,13 @@ CONFIG_TMPFS=y
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_QT602240 is not set
 # CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
@@ -2811,6 +2819,8 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_OHCI_HCD_PCI is not set
 # CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
 # CONFIG_USB_OHCI_HCD_PPC_SOC is not set
 # CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -3132,3 +3142,4 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_ZRAM is not set
+# CONFIG_SIGMA is not set