X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fimx6%2Fconfig-3.14;fp=target%2Flinux%2Fimx6%2Fconfig-3.14;h=55fcf3b5a38799be19f543f9cc188ac789985579;hb=5ee7228a8df2780dc8a06c49d1a98fc0d19be4df;hp=3e4732efb88e356853bbb43465933d02cbe0a666;hpb=e448546005c2db6885f9d8c88c65d8232734ca5c;p=openwrt.git

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