summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Jiejing <jiejing.zhang@freescale.com>2012-05-02 13:38:20 +0800
committerZhang Jiejing <jiejing.zhang@freescale.com>2012-05-03 10:11:34 +0800
commit0ab761cc10225824e4bb5296f304cad17a48a113 (patch)
tree1b1b5a5993b6f3c88586160bafca90b5ca26c6c2
parent72c5e50117057e6f3d0d8a8f91165942a625fc1d (diff)
ENGR00181387-2 config: enable suspend counter by default.
enable suspend counter driver by default. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
-rw-r--r--arch/arm/configs/imx6_android_defconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig
index c169e1427cca..1c4a97d50376 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -661,6 +661,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
# CONFIG_NETFILTER_XT_TARGET_HL is not set
# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
CONFIG_NETFILTER_XT_TARGET_MARK=y
# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
@@ -889,6 +890,7 @@ CONFIG_LIB80211_CRYPT_TKIP=y
# CONFIG_WIMAX is not set
CONFIG_RFKILL=y
CONFIG_RFKILL_PM=y
+CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL_REGULATOR is not set
# CONFIG_RFKILL_GPIO is not set
@@ -1030,6 +1032,7 @@ CONFIG_MISC_DEVICES=y
# CONFIG_SENSORS_BH1780 is not set
# CONFIG_SENSORS_BH1770 is not set
# CONFIG_SENSORS_APDS990X is not set
+CONFIG_SUSPEND_COUNTER=y
# CONFIG_HMC6352 is not set
# CONFIG_SENSORS_AK8975 is not set
# CONFIG_DS1682 is not set
@@ -2317,6 +2320,10 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_LEDS_TRIGGER_SLEEP=y
#
+# iptables trigger is under Netfilter config (LED target)
+#
+
+#
# LED Triggers
#
# CONFIG_NFC_DEVICES is not set