From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673Ab1LIFd1 (ORCPT ); Fri, 9 Dec 2011 00:33:27 -0500 Received: from claw.goop.org ([74.207.240.146]:33447 "EHLO claw.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750792Ab1LIFdX (ORCPT ); Fri, 9 Dec 2011 00:33:23 -0500 Message-ID: <4EE19DA0.5010705@goop.org> Date: Thu, 08 Dec 2011 21:33:20 -0800 From: Jeremy Fitzhardinge User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111115 Thunderbird/8.0 MIME-Version: 1.0 To: Jiri Kosina , Benjamin Herrenschmidt , LinuxPPC-dev , Linux Kernel ML Subject: Re: linux-next bad Kconfig for drivers/hid References: <20111209012746.GC20353@thor.bakeyournoodle.com> In-Reply-To: <20111209012746.GC20353@thor.bakeyournoodle.com> X-Enigmail-Version: 1.3.3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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"? J