diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-05-11 09:50:29 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-05-11 09:50:29 -0500 |
| commit | bdb4622364f51972702ebba118836ae9d17b380e (patch) | |
| tree | 3d48ca25e0802ddc77cf463cb0b15ceaa1b5a9a1 | |
| parent | 20e1a73008ee57bf925c5965c7a3f1ba1bde0387 (diff) | |
| parent | 36bbeadcee26e2c1de0d6a15f11e0c284ccddba8 (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x6P2ti-2.6.33.2-omap4-L24.6-p2
| -rw-r--r-- | arch/arm/configs/omap_4430sdp_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig index 8b2c8d9b8760..a68b72f4dcb3 100644 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ b/arch/arm/configs/omap_4430sdp_defconfig @@ -824,7 +824,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PDA_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set -CONFIG_TWL6030_BCI_BATTERY=y +CONFIG_TWL6030_BCI_BATTERY=m # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_HWMON is not set |