From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: [PATCH -next] olpc: fix olpc-xo1-sci.c build when INPUT=m Date: Tue, 10 Jan 2012 13:30:03 -0800 Message-ID: <4F0CADDB.5010303@xenotime.net> References: <20120110164454.b595335a42321c80fba56ea7@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy1-pub.bluehost.com ([66.147.249.253]:47258 "HELO oproxy1-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756672Ab2AJUbx (ORCPT ); Tue, 10 Jan 2012 15:31:53 -0500 In-Reply-To: <20120110164454.b595335a42321c80fba56ea7@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML , Andrew Morton , x86 maintainers , Andres Salomon , Chris Ball , Jon Nettleton From: Randy Dunlap Fix build errors when CONFIG_INPUT=m. This is not pretty, but all of the OLPC kconfig options are bool instead of tristate. arch/x86/built-in.o: In function `send_lid_state': olpc-xo1-sci.c:(.text+0x1d323): undefined reference to `input_event' olpc-xo1-sci.c:(.text+0x1d338): undefined reference to `input_event' arch/x86/built-in.o: In function `free_ebook_switch': olpc-xo1-sci.c:(.text+0x1d529): undefined reference to `input_unregister_device' olpc-xo1-sci.c:(.text+0x1d533): undefined reference to `input_free_device' arch/x86/built-in.o: In function `free_power_button': olpc-xo1-sci.c:(.text+0x1d549): undefined reference to `input_unregister_device' olpc-xo1-sci.c:(.text+0x1d553): undefined reference to `input_free_device' arch/x86/built-in.o: In function `send_ebook_state': olpc-xo1-sci.c:(.text+0x1d632): undefined reference to `input_event' olpc-xo1-sci.c:(.text+0x1d647): undefined reference to `input_event' arch/x86/built-in.o: In function `xo1_sci_intr': olpc-xo1-sci.c:(.text+0x1d78e): undefined reference to `input_event' olpc-xo1-sci.c:(.text+0x1d7a3): undefined reference to `input_event' olpc-xo1-sci.c:(.text+0x1d7be): undefined reference to `input_event' arch/x86/built-in.o:olpc-xo1-sci.c:(.text+0x1d7d3): more undefined references to `input_event' follow arch/x86/built-in.o: In function `free_lid_switch': olpc-xo1-sci.c:(.text+0x1d7fd): undefined reference to `input_unregister_device' olpc-xo1-sci.c:(.text+0x1d807): undefined reference to `input_free_device' arch/x86/built-in.o: In function `setup_lid_switch': olpc-xo1-sci.c:(.devinit.text+0x155): undefined reference to `input_allocate_device' olpc-xo1-sci.c:(.devinit.text+0x1a4): undefined reference to `input_register_device' olpc-xo1-sci.c:(.devinit.text+0x1ce): undefined reference to `input_unregister_device' olpc-xo1-sci.c:(.devinit.text+0x1d8): undefined reference to `input_free_device' arch/x86/built-in.o: In function `xo1_sci_probe': olpc-xo1-sci.c:(.devinit.text+0x235): undefined reference to `input_allocate_device' olpc-xo1-sci.c:(.devinit.text+0x285): undefined reference to `input_register_device' olpc-xo1-sci.c:(.devinit.text+0x299): undefined reference to `input_free_device' olpc-xo1-sci.c:(.devinit.text+0x2e1): undefined reference to `input_register_device' olpc-xo1-sci.c:(.devinit.text+0x2f5): undefined reference to `input_free_device' olpc-xo1-sci.c:(.devinit.text+0x54c): undefined reference to `input_allocate_device' Signed-off-by: Randy Dunlap Cc: Andres Salomon Cc: Chris Ball Cc: Jon Nettleton --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) --- linux-next-20120110.orig/arch/x86/Kconfig +++ linux-next-20120110/arch/x86/Kconfig @@ -2132,6 +2132,7 @@ config OLPC_XO1_RTC config OLPC_XO1_SCI bool "OLPC XO-1 SCI extras" depends on OLPC && OLPC_XO1_PM + depends on INPUT=y select POWER_SUPPLY select GPIO_CS5535 select MFD_CORE