On Thu, December 8, 2011 9:33 pm, Jeremy Fitzhardinge wrote: > On 12/08/2011 05:27 PM, Tony Breeds wrote: >> Commit 4f5ca836bef3 (HID: hid-input: add support for HID devices >> reporting Battery Strength) went into linux-next on Dec 1st since then a >> ppc6xx_defconfig has been failing with: >> >> --- >> drivers/built-in.o: In function `hidinput_cleanup_battery': >> /scratch/tony/working/drivers/hid/hid-input.c:351: undefined reference >> to `power_supply_unregister' >> drivers/built-in.o: In function `hidinput_setup_battery': >> /scratch/tony/working/drivers/hid/hid-input.c:338: undefined reference >> to `power_supply_register' >> make[1]: *** [.tmp_vmlinux1] Error 1 >> --- >> >> http://kisskb.ellerman.id.au/kisskb/buildresult/5012563/ >> vs >> http://kisskb.ellerman.id.au/kisskb/buildresult/5017366/ >> >> The defconfig in question doens't mention either option >> (CONFIG_POWER_SUPPLY or CONFIG_HID_BATTERY_STRENGTH) and kbuild is >> genertaing >> CONFIG_HID_BATTERY_STRENGTH=y >> CONFIG_POWER_SUPPLY=m >> which clearly isn't going to work. >> >> The following change to HID_BATTERY_STRENGTH Kconfig "works" but seems a >> little gross. >> >> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig >> index 5ed64f6..d2a94e6 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 POWER_SUPPLY=y >> default y >> >> config HIDRAW >> >> Any chance we can get a fix into linux-next? > > Hm. How about making it "depends on HID && POWER_SUPPLY"? I think that > would needlessly disable it if HID is also modular, but I'm not sure how > to fix that. "depends on HID && POWER_SUPPLY && HID == POWER_SUPPLY"?
The last suggestion looks good to me. -- ~Randy _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev