kernel: sort Kconfig options in kernel configs

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

SVN-Revision: 41614

14 files changed, 20 insertions, 20 deletions

diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10
index fbd22b997d..36beb41513 100644
--- a/target/linux/ar71xx/config-3.10
+++ b/target/linux/ar71xx/config-3.10
@@ -51,8 +51,8 @@ CONFIG_ATH79_MACH_EL_M150=y
 CONFIG_ATH79_MACH_EL_MINI=y
 CONFIG_ATH79_MACH_EW_DORIN=y
 CONFIG_ATH79_MACH_GS_OOLITE=y
-CONFIG_ATH79_MACH_HORNET_UB=y
 CONFIG_ATH79_MACH_HIWIFI_HC6361=y
+CONFIG_ATH79_MACH_HORNET_UB=y
 CONFIG_ATH79_MACH_JA76PF=y
 CONFIG_ATH79_MACH_JWAP003=y
 CONFIG_ATH79_MACH_MR600=y
diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default
index e1c90a10d3..9ab6390807 100644
--- a/target/linux/at91/config-default
+++ b/target/linux/at91/config-default
@@ -162,6 +162,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -256,4 +257,3 @@ CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index 2d97df8d61..cef8b16cf2 100644
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -521,12 +521,12 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_DEBUG is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_NFSD_EXPORT is not set
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_SMB2 is not set
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
diff --git a/target/linux/generic/config-3.13 b/target/linux/generic/config-3.13
index af69b18d4e..c2fcc87461 100644
--- a/target/linux/generic/config-3.13
+++ b/target/linux/generic/config-3.13
@@ -562,12 +562,12 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_DEBUG is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_NFSD_EXPORT is not set
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_SMB2 is not set
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
@@ -3536,8 +3536,8 @@ CONFIG_SYSCTL=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_SYSV_FS is not set
@@ -3608,8 +3608,8 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
@@ -3631,13 +3631,13 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_ST1232 is not set
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
diff --git a/target/linux/generic/config-3.14 b/target/linux/generic/config-3.14
index afe0eaf6a3..73f8107945 100644
--- a/target/linux/generic/config-3.14
+++ b/target/linux/generic/config-3.14
@@ -14,9 +14,9 @@ CONFIG_32BIT=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_EXTLOG is not set
 # CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_INT3403_THERMAL is not set
 # CONFIG_ACPI_POWER_METER is not set
 # CONFIG_ACPI_QUICKSTART is not set
-# CONFIG_ACPI_INT3403_THERMAL is not set
 # CONFIG_AD2S1200 is not set
 # CONFIG_AD2S1210 is not set
 # CONFIG_AD2S90 is not set
@@ -575,12 +575,12 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_DEBUG is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_NFSD_EXPORT is not set
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_SMB2 is not set
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10
index d7cb3ff23d..21433fc76c 100644
--- a/target/linux/imx6/config-3.10
+++ b/target/linux/imx6/config-3.10
@@ -235,6 +235,7 @@ CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -363,4 +364,3 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/imx6/config-3.14 b/target/linux/imx6/config-3.14
index 3e4732efb8..55fcf3b5a3 100644
--- a/target/linux/imx6/config-3.14
+++ b/target/linux/imx6/config-3.14
@@ -71,7 +71,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_GENERIC_CPUFREQ_CPU0=n
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_HAS_ASID=y
@@ -123,6 +122,7 @@ CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_CHIP=y
@@ -239,6 +239,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -364,4 +365,3 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/kirkwood/config-3.10 b/target/linux/kirkwood/config-3.10
index 3e68c713ab..91de23db41 100644
--- a/target/linux/kirkwood/config-3.10
+++ b/target/linux/kirkwood/config-3.10
@@ -179,6 +179,7 @@ CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -285,4 +286,3 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/kirkwood/config-3.14 b/target/linux/kirkwood/config-3.14
index 750726c0da..530b3c8f93 100644
--- a/target/linux/kirkwood/config-3.14
+++ b/target/linux/kirkwood/config-3.14
@@ -195,6 +195,7 @@ CONFIG_MTD_NAND_ORION=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -302,4 +303,3 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/lantiq/xrx200/config-default b/target/linux/lantiq/xrx200/config-default
index f72b12f384..09dfbdd2a0 100644
--- a/target/linux/lantiq/xrx200/config-default
+++ b/target/linux/lantiq/xrx200/config-default
@@ -30,6 +30,7 @@ CONFIG_MTD_NAND_XWAY=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 CONFIG_MTD_UBI_GLUEBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -60,4 +61,3 @@ CONFIG_USB_SUPPORT=y
 CONFIG_XRX200_PHY_FW=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/malta/config-3.10 b/target/linux/malta/config-3.10
index d652bb2df0..5232688f61 100644
--- a/target/linux/malta/config-3.10
+++ b/target/linux/malta/config-3.10
@@ -173,6 +173,7 @@ CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -266,4 +267,3 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VXFS_FS=y
 # CONFIG_WATCHDOG is not set
 CONFIG_XPS=y
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/malta/config-3.12 b/target/linux/malta/config-3.12
index d652bb2df0..5232688f61 100644
--- a/target/linux/malta/config-3.12
+++ b/target/linux/malta/config-3.12
@@ -173,6 +173,7 @@ CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -266,4 +267,3 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VXFS_FS=y
 # CONFIG_WATCHDOG is not set
 CONFIG_XPS=y
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/mpc83xx/config-3.8 b/target/linux/mpc83xx/config-3.8
index b9d6ee4300..cedd0477ae 100644
--- a/target/linux/mpc83xx/config-3.8
+++ b/target/linux/mpc83xx/config-3.8
@@ -221,6 +221,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -406,4 +407,3 @@ CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_XATTR=y
 CONFIG_YAFFS_YAFFS1=y
 CONFIG_YAFFS_YAFFS2=y
-# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/xburst/config-3.10 b/target/linux/xburst/config-3.10
index c97f73ca29..1cf1a274e8 100644
--- a/target/linux/xburst/config-3.10
+++ b/target/linux/xburst/config-3.10
@@ -182,6 +182,7 @@ CONFIG_MTD_NAND_JZ4740=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -328,4 +329,3 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_MTD_UBI_BLOCK is not set