diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:58:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:58:33 -0700 |
| commit | 16bb85bc12e7d0b066b1471185f3889cb1ceb382 (patch) | |
| tree | 88f7bb3ff052ea0e68d5416853d8fd68a508d8e7 /drivers/power/Kconfig | |
| parent | x86/hpet: Use the FSEC_PER_SEC constant for femto-second periods (diff) | |
| parent | intel_mid_battery: Fix battery scaling (diff) | |
| download | linux-dev-16bb85bc12e7d0b066b1471185f3889cb1ceb382.tar.xz linux-dev-16bb85bc12e7d0b066b1471185f3889cb1ceb382.zip | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
intel_mid_battery: Fix battery scaling
intel_mid_battery: Fix the argument order to intel_scu_ipc_command
olpc_battery: Fix build failure caused by sysfs changes
Add s3c-adc-battery driver
Intel MID platform battery driver
Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 1e5506be39b4..07343568a12e 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -136,6 +136,12 @@ config BATTERY_Z2 help Say Y to include support for the battery on the Zipit Z2. +config BATTERY_S3C_ADC + tristate "Battery driver for Samsung ADC based monitoring" + depends on S3C_ADC + help + Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery + config CHARGER_PCF50633 tristate "NXP PCF50633 MBC" depends on MFD_PCF50633 @@ -153,4 +159,11 @@ config BATTERY_JZ4740 This driver can be build as a module. If so, the module will be called jz4740-battery. +config BATTERY_INTEL_MID + tristate "Battery driver for Intel MID platforms" + depends on INTEL_SCU_IPC && SPI + help + Say Y here to enable the battery driver on Intel MID + platforms. + endif # POWER_SUPPLY |