diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 11:04:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 11:04:22 -0500 |
| commit | 1fae4cfb97302289bb5df6a8195eb28385d0b002 (patch) | |
| tree | b432ca0e5354297e19725c5d2089fbd9922a26d0 /drivers/power/Kconfig | |
| parent | c8bf9fec478bb8d3c66067be2aaa4082b83da46c (diff) | |
| parent | afbc74fdc5b96552c384e57119b3cc13c840bf06 (diff) | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
power_supply: bq27x00: fix voltage and current units
power_supply: bq27x00: add status and time properties
power_supply: bq27x00: add BQ27500 support
power_supply: bq27x00: fix temperature conversion
power_supply: bq27x00: remove unused struct fields
power_supply: bq27x00: remove double endian swap
da9030_battery: fix spelling in comment
wm97xx_battery: Clean up some warnings
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index d4b3d67f0548..bf1467213954 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -98,10 +98,10 @@ config BATTERY_WM97XX | |||
| 98 | Say Y to enable support for battery measured by WM97xx aux port. | 98 | Say Y to enable support for battery measured by WM97xx aux port. |
| 99 | 99 | ||
| 100 | config BATTERY_BQ27x00 | 100 | config BATTERY_BQ27x00 |
| 101 | tristate "BQ27200 battery driver" | 101 | tristate "BQ27x00 battery driver" |
| 102 | depends on I2C | 102 | depends on I2C |
| 103 | help | 103 | help |
| 104 | Say Y here to enable support for batteries with BQ27200(I2C) chip. | 104 | Say Y here to enable support for batteries with BQ27x00 (I2C) chips. |
| 105 | 105 | ||
| 106 | config BATTERY_DA9030 | 106 | config BATTERY_DA9030 |
| 107 | tristate "DA9030 battery driver" | 107 | tristate "DA9030 battery driver" |