diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/power/Kconfig | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
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 |