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

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

diff --git a/target/linux/generic/config-3.6 b/target/linux/generic/config-3.6
index 56a5731b1b74b6a5b5deb5c86c0cabe4eab3a208..7af4f6ee7074b503a483a2a155f2863004626f40 100644 (file)
--- a/target/linux/generic/config-3.6
+++ b/target/linux/generic/config-3.6
@@ -184,6 +184,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
@@ -197,6 +198,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