summaryrefslogtreecommitdiff
path: root/packages/linux/linux-openmoko
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2008-12-10 12:08:42 -0800
committerKhem Raj <raj.khem@gmail.com>2008-12-10 12:08:42 -0800
commitc83835dca4b2a8f8267066037c86a71474f278c2 (patch)
treeb8645ff1fa623a7b8ce5496a62c2f2a01fd87887 /packages/linux/linux-openmoko
parentfca5cadc1e2012f01afcdd67d9482a4c52aa52d1 (diff)
parent1a184ff3d7b13923c4b7cd94866307ac8f399bed (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/linux/linux-openmoko')
-rw-r--r--packages/linux/linux-openmoko/defconfig-oe3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe
index 30cf97adc9..5b8fb3776a 100644
--- a/packages/linux/linux-openmoko/defconfig-oe
+++ b/packages/linux/linux-openmoko/defconfig-oe
@@ -1023,8 +1023,9 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_PDA_POWER is not set
# CONFIG_APM_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
-CONFIG_BATTERY_BQ27000_HDQ=y
+### override CONFIG_BATTERY_BQ27000_HDQ=y
CONFIG_GTA02_HDQ=y
+### override CONFIG_BATTERY_GTA01=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set