From e5946c34ba8a559e7385c55b77b89f203d7f8177 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 25 Oct 2012 12:14:41 +1100 Subject: [PATCH] olpc: fix olpc-xo1-sci.c build errors 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' In the long run, fixing this driver kconfig to be tristate instead of bool would be a very good change. Signed-off-by: Randy Dunlap Cc: Andres Salomon Cc: Chris Ball Cc: Jon Nettleton Cc: Daniel Drake Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a91a62cd4ff5..1fd1a92ab846 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2125,6 +2125,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 -- 2.39.5