diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /drivers/power/Kconfig | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 7eda34838bfe..bdbc4f73fcdc 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -43,6 +43,13 @@ config BATTERY_DS2760 | |||
| 43 | help | 43 | help |
| 44 | Say Y here to enable support for batteries with ds2760 chip. | 44 | Say Y here to enable support for batteries with ds2760 chip. |
| 45 | 45 | ||
| 46 | config BATTERY_DS2782 | ||
| 47 | tristate "DS2782 standalone gas-gauge" | ||
| 48 | depends on I2C | ||
| 49 | help | ||
| 50 | Say Y here to enable support for the DS2782 standalone battery | ||
| 51 | gas-gauge. | ||
| 52 | |||
| 46 | config BATTERY_PMU | 53 | config BATTERY_PMU |
| 47 | tristate "Apple PMU battery" | 54 | tristate "Apple PMU battery" |
| 48 | depends on PPC32 && ADB_PMU | 55 | depends on PPC32 && ADB_PMU |