diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 11:20:10 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 11:20:10 +0200 |
commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /drivers/power/Kconfig | |
parent | [JFFS2] Add declaration of jffs2_lzo_{init,exit} to compr.h (diff) | |
parent | Linux 2.6.23-rc1 (diff) | |
download | linux-39fe5434cb9de5da40510028b17b96bc4eb312b3.tar.xz linux-39fe5434cb9de5da40510028b17b96bc4eb312b3.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/power/Kconfig')
-rw-r--r-- | drivers/power/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index ab9c3e5a7c1d..3f6e176e6ea1 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -16,6 +16,7 @@ config POWER_SUPPLY_DEBUG config PDA_POWER tristate "Generic PDA/phone power driver" + depends on !S390 help Say Y here to enable generic power driver for PDAs and phones with one or two external power supplies (AC/USB) connected to main and |