summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-12-16 23:35:55 +0100
committerJiri Kosina <jkosina@suse.cz>2011-12-16 23:35:55 +0100
commit7e69ba7caeb00babd40c69fea7f0628c307d7b99 (patch)
tree7be4b3d661ec389eba56c09d302503aa174224c6 /drivers
parentHID: make parser more verbose about parsing errors by default (diff)
downloadlinux-7e69ba7caeb00babd40c69fea7f0628c307d7b99.tar.xz
linux-7e69ba7caeb00babd40c69fea7f0628c307d7b99.zip
HID: introduce proper dependency of HID_BATTERY on POWER_SUPPLY
ppc6xx_defconfig reveals this: drivers/built-in.o: In function `hidinput_cleanup_battery': drivers/hid/hid-input.c:351: undefined reference to`power_supply_unregister' drivers/built-in.o: In function `hidinput_setup_battery': drivers/hid/hid-input.c:338: undefined reference to `power_supply_register' make[1]: *** [.tmp_vmlinux1] Error 1 The defconfig in question doens't mention either option and kbuild is genertaing CONFIG_HID_BATTERY_STRENGTH=y CONFIG_POWER_SUPPLY=m which is wrong. Put a proper dependency in place. Reported-by: Tony Breeds <tony@bakeyournoodle.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3a97f1fab243..7745c3e42397 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -33,7 +33,7 @@ config HID
config HID_BATTERY_STRENGTH
bool
- depends on POWER_SUPPLY
+ depends on HID && POWER_SUPPLY && HID == POWER_SUPPLY
default y
config HIDRAW