The patch titled Subject: olpc: fix olpc-xo1-sci.c build errors has been added to the -mm tree. Its filename is olpc-fix-olpc-xo1-scic-build-errors.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Subject: 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 <rdunlap@xxxxxxxxxxxx> Cc: Andres Salomon <dilinger@xxxxxxxxxx> Cc: Chris Ball <cjb@xxxxxxxxxx> Cc: Jon Nettleton <jon.nettleton@xxxxxxxxx> Cc: Daniel Drake <dsd@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -puN arch/x86/Kconfig~olpc-fix-olpc-xo1-scic-build-errors arch/x86/Kconfig --- a/arch/x86/Kconfig~olpc-fix-olpc-xo1-scic-build-errors +++ a/arch/x86/Kconfig @@ -2126,6 +2126,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 _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are origin.patch linux-next.patch memcg-kmem-fix-build-error-when-config_inet-is-disabled.patch olpc-fix-olpc-xo1-scic-build-errors.patch kstrto-add-documentation.patch simple_strto-annotate-function-as-obsolete.patch mutex-subsystem-synchro-test-module.patch mutex-subsystem-synchro-test-module-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html