diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 11:12:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 11:12:43 -0500 |
| commit | 79c9601c2e0dbbe69895d302de4d19f3a31fbd30 (patch) | |
| tree | 78d4be2df851b2b4106adcfd736622a90cecf9e9 /drivers/power/Kconfig | |
| parent | 41440ffe21f29bdb985cab76b2d0b06d83e63b19 (diff) | |
| parent | 3d14b5beba35250c548d3851a2b84fce742d8311 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (272 commits)
Fix soc_common PCMCIA configuration
ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request
ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driver
ARM: 5825/1: SA1100: h3600: update defconfig
ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100
ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys
ARM: 5822/1: SA1100: h3100/h3600: clean up #includes
ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates
ARM: 5820/1: SA1100: h3100/h3600: split h3600.c
ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions
ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputs
ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions
ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers
ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib
ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driver
ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpers
ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolib
ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pins
ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.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 cea6cef27e89..118674925516 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -77,6 +77,13 @@ config BATTERY_TOSA | |||
| 77 | Say Y to enable support for the battery on the Sharp Zaurus | 77 | Say Y to enable support for the battery on the Sharp Zaurus |
| 78 | SL-6000 (tosa) models. | 78 | SL-6000 (tosa) models. |
| 79 | 79 | ||
| 80 | config BATTERY_COLLIE | ||
| 81 | tristate "Sharp SL-5500 (collie) battery" | ||
| 82 | depends on SA1100_COLLIE && MCP_UCB1200 | ||
| 83 | help | ||
| 84 | Say Y to enable support for the battery on the Sharp Zaurus | ||
| 85 | SL-5500 (collie) models. | ||
| 86 | |||
| 80 | config BATTERY_WM97XX | 87 | config BATTERY_WM97XX |
| 81 | bool "WM97xx generic battery driver" | 88 | bool "WM97xx generic battery driver" |
| 82 | depends on TOUCHSCREEN_WM97XX=y | 89 | depends on TOUCHSCREEN_WM97XX=y |