diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 17:47:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 17:47:59 -0400 |
| commit | 5f60cfd932b42c69ed3226400cb5eab152576c3a (patch) | |
| tree | 70e4feba5158e76060d36a6c015be8297c294bca /drivers/Kconfig | |
| parent | 9f9d76321659b5ebc9939101481f7c3ce228ea6e (diff) | |
| parent | d7ce6d1d5f6e307a2fbb69626cf120e20e793fe7 (diff) | |
Merge git://git.infradead.org/~dwmw2/battery-2.6
* git://git.infradead.org/~dwmw2/battery-2.6:
[BATTERY] ds2760 W1 slave
[BATTERY] One Laptop Per Child power/battery driver
[BATTERY] Apple PMU driver
[BATTERY] 1-Wire ds2760 chip battery driver
[BATTERY] APM emulation driver for class batteries
[BATTERY] pda_power platform driver
[BATTERY] Universal power supply class (was: battery class)
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 4e6487d461f3..7916f4b86d23 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -52,6 +52,8 @@ source "drivers/spi/Kconfig" | |||
| 52 | 52 | ||
| 53 | source "drivers/w1/Kconfig" | 53 | source "drivers/w1/Kconfig" |
| 54 | 54 | ||
| 55 | source "drivers/power/Kconfig" | ||
| 56 | |||
| 55 | source "drivers/hwmon/Kconfig" | 57 | source "drivers/hwmon/Kconfig" |
| 56 | 58 | ||
| 57 | source "drivers/mfd/Kconfig" | 59 | source "drivers/mfd/Kconfig" |