kernel: refresh kernel configs with kconfig.pl

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38970

3 files changed, 10 insertions, 10 deletions

diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10
index 0f8bfbcdce..f8323235b9 100644
--- a/target/linux/ar71xx/config-3.10
+++ b/target/linux/ar71xx/config-3.10
@@ -73,9 +73,9 @@ CONFIG_ATH79_MACH_TL_MR11U=y
 CONFIG_ATH79_MACH_TL_MR13U=y
 CONFIG_ATH79_MACH_TL_MR3020=y
 CONFIG_ATH79_MACH_TL_MR3X20=y
-CONFIG_ATH79_MACH_TL_WAX50RE=y
 CONFIG_ATH79_MACH_TL_WA901ND=y
 CONFIG_ATH79_MACH_TL_WA901ND_V2=y
+CONFIG_ATH79_MACH_TL_WAX50RE=y
 CONFIG_ATH79_MACH_TL_WDR3500=y
 CONFIG_ATH79_MACH_TL_WDR4300=y
 CONFIG_ATH79_MACH_TL_WR1041N_V2=y
diff --git a/target/linux/generic/config-3.12 b/target/linux/generic/config-3.12
index 53ee79a317..69db55667d 100644
--- a/target/linux/generic/config-3.12
+++ b/target/linux/generic/config-3.12
@@ -107,8 +107,8 @@ CONFIG_AIO=y
 # CONFIG_AMILO_RFKILL is not set
 # CONFIG_ANDROID is not set
 CONFIG_ANON_INODES=y
-# CONFIG_APDS9802ALS is not set
 # CONFIG_APDS9300 is not set
+# CONFIG_APDS9802ALS is not set
 # CONFIG_APM8018X is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AR5523 is not set
@@ -1146,10 +1146,10 @@ CONFIG_HAVE_KRETPROBES=y
 # CONFIG_HID_TOPSEED is not set
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_XINMO is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HIGHMEM is not set
@@ -1763,7 +1763,6 @@ CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MEMORY_FAILURE is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_NAU7802 is not set
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
@@ -2048,6 +2047,7 @@ CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_NAMESPACES is not set
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NATSEMI is not set
+# CONFIG_NAU7802 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NE2000 is not set
 # CONFIG_NE2K_PCI is not set
@@ -3504,8 +3504,8 @@ CONFIG_TIMERFD=y
 # CONFIG_TIMER_STATS is not set
 CONFIG_TINY_RCU=y
 # CONFIG_TIPC is not set
-# CONFIG_TI_AM335X_ADC is not set
 # CONFIG_TI_ADC081C is not set
+# CONFIG_TI_AM335X_ADC is not set
 # CONFIG_TI_CPSW is not set
 # CONFIG_TI_CPTS is not set
 # CONFIG_TI_DAC7512 is not set
@@ -3514,10 +3514,10 @@ CONFIG_TINY_RCU=y
 # CONFIG_TI_ST is not set
 # CONFIG_TLAN is not set
 # CONFIG_TMD_HERMES is not set
+# CONFIG_TMP006 is not set
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 CONFIG_TMPFS_XATTR=y
-# CONFIG_TMP006 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_AD7879_I2C is not set
@@ -4096,11 +4096,11 @@ CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
 # CONFIG_WIRELESS_EXT_SYSFS is not set
-# CONFIG_WLAGS49_H2 is not set
-# CONFIG_WLAGS49_H25 is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
 # CONFIG_WL18XX is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
 CONFIG_WLAN=y
 # CONFIG_WLCORE is not set
 CONFIG_WL_TI=y
diff --git a/target/linux/omap/config-default b/target/linux/omap/config-default
index ea094379aa..ee797926f9 100644
--- a/target/linux/omap/config-default
+++ b/target/linux/omap/config-default
@@ -343,12 +343,12 @@ CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_BCH=y
-# CONFIG_MTD_NAND_OMAP_BCH4 is not set
-CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_ECC_BCH=y
 CONFIG_MTD_NAND_OMAP2=y
 CONFIG_MTD_NAND_OMAP_BCH=y
+# CONFIG_MTD_NAND_OMAP_BCH4 is not set
+CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_PHYSMAP_OF is not set
 # CONFIG_MTD_SM_COMMON is not set