kernel: bcma: update to wireless-testing master-2013-10-01

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

diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index 943c217..ca13c43 100644 (file)
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -961,12 +961,12 @@ CONFIG_GACT_PROB=y
 # CONFIG_GAMEPORT is not set
 # CONFIG_GCOV is not set
 # CONFIG_GCOV_KERNEL is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
-# CONFIG_PWM is not set
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_GIGASET_CAPI is not set
@@ -1001,6 +1001,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_WDT is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GREENASIA_FF is not set
 # CONFIG_HAMACHI is not set
@@ -1222,6 +1223,15 @@ CONFIG_HZ_100=y
 # CONFIG_IGB is not set
 # CONFIG_IGBVF is not set
 # CONFIG_IIO is not set
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_GPIO_TRIGGER is not set
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
@@ -1528,6 +1538,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KS8851_MLL is not set
 # CONFIG_KSM is not set
 # CONFIG_KSZ884X_PCI is not set
+CONFIG_KUSER_HELPERS=y
 # CONFIG_KVM_GUEST is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_L2TP is not set
@@ -1931,12 +1942,17 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_SPLIT=y
+# CONFIG_MTD_SPLIT_FIRMWARE is not set
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+# CONFIG_MTD_SPLIT_SEAMA_FW is not set
+# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
+# CONFIG_MTD_SPLIT_UIMAGE_FW is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SWAP is not set
 # CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_UBI is not set
 # CONFIG_MTD_UIMAGE_SPLIT is not set
-CONFIG_MTD_UIMAGE_SPLIT_NAME="firmware"
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_MV643XX_ETH is not set
 # CONFIG_MVMDIO is not set
@@ -3412,11 +3428,11 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TR is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_TRACE_SINK is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set