The patch titled I8042: Use SGI_HAS_I8042 to select SGI i8042 handlinig has been added to the -mm tree. Its filename is i8042-use-sgi_has_i8042-to-select-sgi-i8042-handlinig.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 *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: I8042: Use SGI_HAS_I8042 to select SGI i8042 handlinig From: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx> Use SGI_HAS_I8042 to select SGI i8042 handling Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/input/serio/i8042.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/input/serio/i8042.h~i8042-use-sgi_has_i8042-to-select-sgi-i8042-handlinig drivers/input/serio/i8042.h --- a/drivers/input/serio/i8042.h~i8042-use-sgi_has_i8042-to-select-sgi-i8042-handlinig +++ a/drivers/input/serio/i8042.h @@ -16,7 +16,7 @@ #if defined(CONFIG_MACH_JAZZ) #include "i8042-jazzio.h" -#elif defined(CONFIG_SGI_IP22) +#elif defined(CONFIG_SGI_HAS_I8042) #include "i8042-ip22io.h" #elif defined(CONFIG_PPC) #include "i8042-ppcio.h" _ Patches currently in -mm which might be from tsbogend@xxxxxxxxxxxxxxxx are mips-fix-sni_rm-eisa=n-compilation.patch git-watchdog.patch i8042-use-sgi_has_i8042-to-select-sgi-i8042-handlinig.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