X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-3.10;h=61c7cf794bca6f0f0e37511900af744a1de30d8f;hb=95d51c263c5a1b520e46d24bfde764529cb4d8e2;hp=d8e88792bb2674fa7219541bdeab7f41df1d60af;hpb=44c503a3e0bbe2acb7e97709ef0d5d8bbedf9245;p=openwrt.git

diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index d8e88792bb..61c7cf794b 100644
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -270,6 +270,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
 # CONFIG_B53 is not set
+# CONFIG_B53_SPI_DRIVER is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 # CONFIG_BACKLIGHT_LM3630 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
@@ -891,6 +892,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
@@ -964,7 +966,6 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 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
@@ -999,6 +1000,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
@@ -1526,6 +1528,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
@@ -1929,12 +1932,15 @@ 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_SQUASHFS_ROOT 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
@@ -2455,6 +2461,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCNET32 is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 # CONFIG_PD6729 is not set
+# CONFIG_PDA_POWER is not set
 # CONFIG_PDC_ADMA is not set
 # CONFIG_PERF_COUNTERS is not set
 # CONFIG_PERF_EVENTS is not set
@@ -2902,6 +2909,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843 is not set
 # CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_ISL29018 is not set
@@ -3408,11 +3416,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