Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5f17c70fe6d0b8562bf396f7e5638f243ebe4da8

Authored by Al Viro
Committed by Linus Torvalds
1 parent 51ec138c64
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

PDA_POWER depends on having request_irq() 

... so all proud owners of s390-based PDAs will have to live without that one

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 0 deletions Inline Diff

drivers/power/Kconfig
Diff comments   View file @ 5f17c70
1 menuconfig POWER_SUPPLY 1 menuconfig POWER_SUPPLY
2 tristate "Power supply class support" 2 tristate "Power supply class support"
3 help 3 help
4 Say Y here to enable power supply class support. This allows 4 Say Y here to enable power supply class support. This allows
5 power supply (batteries, AC, USB) monitoring by userspace 5 power supply (batteries, AC, USB) monitoring by userspace
6 via sysfs and uevent (if available) and/or APM kernel interface 6 via sysfs and uevent (if available) and/or APM kernel interface
7 (if selected below). 7 (if selected below).
8 8
9 if POWER_SUPPLY 9 if POWER_SUPPLY
10 10
11 config POWER_SUPPLY_DEBUG 11 config POWER_SUPPLY_DEBUG
12 bool "Power supply debug" 12 bool "Power supply debug"
13 help 13 help
14 Say Y here to enable debugging messages for power supply class 14 Say Y here to enable debugging messages for power supply class
15 and drivers. 15 and drivers.
16 16
17 config PDA_POWER 17 config PDA_POWER
18 tristate "Generic PDA/phone power driver" 18 tristate "Generic PDA/phone power driver"
19 depends on !S390
19 help 20 help
20 Say Y here to enable generic power driver for PDAs and phones with 21 Say Y here to enable generic power driver for PDAs and phones with
21 one or two external power supplies (AC/USB) connected to main and 22 one or two external power supplies (AC/USB) connected to main and
22 backup batteries, and optional builtin charger. 23 backup batteries, and optional builtin charger.
23 24
24 config APM_POWER 25 config APM_POWER
25 tristate "APM emulation for class batteries" 26 tristate "APM emulation for class batteries"
26 depends on APM_EMULATION 27 depends on APM_EMULATION
27 help 28 help
28 Say Y here to enable support APM status emulation using 29 Say Y here to enable support APM status emulation using
29 battery class devices. 30 battery class devices.
30 31
31 config BATTERY_DS2760 32 config BATTERY_DS2760
32 tristate "DS2760 battery driver (HP iPAQ & others)" 33 tristate "DS2760 battery driver (HP iPAQ & others)"
33 select W1 34 select W1
34 select W1_SLAVE_DS2760 35 select W1_SLAVE_DS2760
35 help 36 help
36 Say Y here to enable support for batteries with ds2760 chip. 37 Say Y here to enable support for batteries with ds2760 chip.
37 38
38 config BATTERY_PMU 39 config BATTERY_PMU
39 tristate "Apple PMU battery" 40 tristate "Apple PMU battery"
40 depends on ADB_PMU 41 depends on ADB_PMU
41 help 42 help
42 Say Y here to expose battery information on Apple machines 43 Say Y here to expose battery information on Apple machines
43 through the generic battery class. 44 through the generic battery class.
44 45
45 config BATTERY_OLPC 46 config BATTERY_OLPC
46 tristate "One Laptop Per Child battery" 47 tristate "One Laptop Per Child battery"
47 depends on X86_32 && OLPC 48 depends on X86_32 && OLPC
48 help 49 help
49 Say Y to enable support for the battery on the OLPC laptop. 50 Say Y to enable support for the battery on the OLPC laptop.
50 51
51 endif # POWER_SUPPLY 52 endif # POWER_SUPPLY
52 53