From: Zhang Jiejing <jiejing.zhang@freescale.com>
Date: Mon, 13 Feb 2012 10:17:20 +0000 (+0800)
Subject: ENGR00174121-3 MX6: add max8903 driver in defconfig.
X-Git-Tag: v3.0.35-fsl~1478
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8bcebd34f970eeb7573b1b102aef3cd3e52d013d;p=karo-tx-linux.git

ENGR00174121-3 MX6: add max8903 driver in defconfig.

enable max8903 in defconfig.

Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
---

diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index ebda1947a3a5..66db9a8fca74 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -306,6 +306,7 @@ CONFIG_MACH_MX6Q_SABREAUTO=y
 #
 # MX6 Options:
 #
+# CONFIG_IMX_PCIE is not set
 CONFIG_ISP1504_MXC=y
 # CONFIG_MXC_IRQ_PRIOR is not set
 CONFIG_MXC_PWM=y
@@ -638,15 +639,19 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=y
-CONFIG_WIRELESS_EXT_SYSFS=y
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=y
 CONFIG_LIB80211_CRYPT_WEP=y
 CONFIG_LIB80211_CRYPT_CCMP=y
 CONFIG_LIB80211_CRYPT_TKIP=y
 # CONFIG_LIB80211_DEBUG is not set
-
 # CONFIG_MAC80211 is not set
 # CONFIG_WIMAX is not set
 CONFIG_RFKILL=y
@@ -1260,7 +1265,20 @@ CONFIG_GPIOLIB=y
 # MODULbus GPIO expanders:
 #
 # CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ20Z75 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+CONFIG_CHARGER_MAX8903=y
+# CONFIG_CHARGER_GPIO is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set