kernel: Add ATM fixes pending upstream merge (queue reduction, race fixes)

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

diff --git a/target/linux/generic/config-3.7 b/target/linux/generic/config-3.7
index 349eb94348835a200c77cc4fd30d3f52417870b0..86686aa033a26e045fea8e72bdd720011c513d64 100644 (file)
--- a/target/linux/generic/config-3.7
+++ b/target/linux/generic/config-3.7
@@ -201,6 +201,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BCM63XX_PHY is not set
 # CONFIG_BCM87XX_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
@@ -435,8 +436,8 @@ CONFIG_CONSTRUCTORS=y
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_COPS is not set
 # CONFIG_CORDIC is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_COREDUMP is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_FREQ is not set
@@ -2018,8 +2019,8 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
 CONFIG_NF_NAT_IPV4=m
+# CONFIG_NF_NAT_IRC is not set
 # CONFIG_NF_NAT_NEEDED is not set
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_PROTO_GRE is not set
@@ -2730,6 +2731,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_MFD_HSU is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
@@ -2976,6 +2978,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_RAMIPS is not set
+# CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
@@ -3004,8 +3007,8 @@ CONFIG_STAGING=y
 # CONFIG_STAGING_MEDIA is not set
 CONFIG_STANDALONE=y
 CONFIG_STDBINUTILS=y
-# CONFIG_STE_MODEM_RPROC is not set
 # CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
 # CONFIG_STMMAC_ETH is not set
 CONFIG_STP=y
 # CONFIG_STRICT_DEVMEM is not set
@@ -3095,8 +3098,8 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_ILI210X is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_S3C2410 is not set
@@ -3396,6 +3399,7 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_ZTE is not set
 # CONFIG_USB_SEVSEG is not set
 # CONFIG_USB_SIERRA_NET is not set
 # CONFIG_USB_SISUSBVGA is not set