summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-05-09 10:54:01 +0200
committerKoen Kooi <koen@openembedded.org>2010-05-10 17:24:41 +0200
commit1a733aa29a95816cc344bb38441338963f1e0180 (patch)
treebad752108628af4b7c6431a833b789815c751fde /recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
parentacd000615cb77c4805f43df177fbe08cd2244195 (diff)
linux-omap-psp 2.6.32: rediff touchbook and beagleboard patches, tweak beagleboard defconfig
Diffstat (limited to 'recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig')
-rw-r--r--recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
index 4165d4cf74..6f2b7bd989 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32
-# Tue May 4 08:42:43 2010
+# Mon May 10 12:50:28 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1489,6 +1489,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_DS2782 is not set
CONFIG_BATTERY_BQ27x00=y
# CONFIG_BATTERY_MAX17040 is not set
+CONFIG_TWL4030_BCI_BATTERY=y
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1598,7 +1599,7 @@ CONFIG_MFD_CORE=y
CONFIG_TWL4030_CORE=y
# CONFIG_TWL4030_POWER is not set
CONFIG_TWL4030_CODEC=y
-# CONFIG_TWL4030_MADC is not set
+CONFIG_TWL4030_MADC=y
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC6387XB is not set