sunxi: move a lost CONFIG_CHARGER symbol to generic

[openwrt.git] / target / linux / sunxi / config-3.12

diff --git a/target/linux/sunxi/config-3.12 b/target/linux/sunxi/config-3.12
index 3a59082..2ef8c2a 100644 (file)
--- a/target/linux/sunxi/config-3.12
+++ b/target/linux/sunxi/config-3.12
@@ -67,7 +67,7 @@ CONFIG_CLKSRC_MMIO=y
 CONFIG_CLKSRC_OF=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMDLINE="console=ttyS0,115200 earlyprintk rootwait root=/dev/mmcblk0p2"
-CONFIG_CMDLINE_FORCE=y
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_COMMON_CLK=y
 CONFIG_COMPACTION=y
 CONFIG_CONFIGFS_FS=y
@@ -235,7 +235,6 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KSM=y
 CONFIG_KTIME_SCALAR=y
-# CONFIG_LBDAF is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_REGULATOR is not set
 CONFIG_LEGACY_PTYS=y
@@ -251,8 +250,8 @@ CONFIG_MIGRATION=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
-CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_SUNXI=y
+CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MODULES_USE_ELF_REL=y
 # CONFIG_MTD is not set
 CONFIG_MULTI_IRQ_HANDLER=y
@@ -359,6 +358,7 @@ CONFIG_STOP_MACHINE=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SUN4I_EMAC is not set
 CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
 # CONFIG_SUNXI_WATCHDOG is not set
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y