diff --git a/[refs] b/[refs]
index 667a31dafec8..b7f4971a76f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85f094ecb1c52b9ec9a88c9d2c8beaba72b4f21f
+refs/heads/master: 105eabfd5164dac5c3c825ae6bc050c1ad45ca51
diff --git a/trunk/drivers/input/serio/i8042-io.h b/trunk/drivers/input/serio/i8042-io.h
index 3b4e13b9ce1b..f451c7351a9d 100644
--- a/trunk/drivers/input/serio/i8042-io.h
+++ b/trunk/drivers/input/serio/i8042-io.h
@@ -25,7 +25,7 @@
 #elif defined(__arm__)
 /* defined in include/asm-arm/arch-xxx/irqs.h */
 #include <asm/irq.h>
-#elif defined(CONFIG_SUPERH64)
+#elif defined(CONFIG_SH_CAYMAN)
 #include <asm/irq.h>
 #else
 # define I8042_KBD_IRQ	1