diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2014-07-13 16:25:54 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2014-07-13 16:25:54 +0000 |
commit | d0ad8c00b6cc0716feae5d12c2ae5b4717c4ac29 (patch) | |
tree | 3050b5cbce516cd215941a02a6dd0ada941cea01 /target/linux/imx6 | |
parent | 59cfa05bf3c533c0694ca4f22e787952234fc1ac (diff) | |
download | upstream-d0ad8c00b6cc0716feae5d12c2ae5b4717c4ac29.tar.gz upstream-d0ad8c00b6cc0716feae5d12c2ae5b4717c4ac29.tar.bz2 upstream-d0ad8c00b6cc0716feae5d12c2ae5b4717c4ac29.zip |
kernel: sort Kconfig options in kernel configs
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 41614
Diffstat (limited to 'target/linux/imx6')
-rw-r--r-- | target/linux/imx6/config-3.10 | 2 | ||||
-rw-r--r-- | target/linux/imx6/config-3.14 | 4 |
2 files changed, 3 insertions, 3 deletions
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 |