diff --git a/[refs] b/[refs]
index cd74c0069fa0..3b1f5df28037 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e24e2e64c468c8060bb7173abecdf11d00ed5751
+refs/heads/master: f47831fabaf0206abc56ee5a33fd006fe29b6dc6
diff --git a/trunk/drivers/input/serio/i8042.h b/trunk/drivers/input/serio/i8042.h
index dd22d91f8b39..c972e5d03a3f 100644
--- a/trunk/drivers/input/serio/i8042.h
+++ b/trunk/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"