diff --git a/[refs] b/[refs]
index d6f34ecd125d..dd2afbe774f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 436d42c61c3eef1d02256174c8615046c61a28ad
+refs/heads/master: 6884b680459ab850f99fc37605084187bc9888ac
diff --git a/trunk/drivers/input/keyboard/spear-keyboard.c b/trunk/drivers/input/keyboard/spear-keyboard.c
index 72ef01be3360..c7ca97f44bfb 100644
--- a/trunk/drivers/input/keyboard/spear-keyboard.c
+++ b/trunk/drivers/input/keyboard/spear-keyboard.c
@@ -24,7 +24,7 @@
 #include <linux/pm_wakeup.h>
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <plat/keyboard.h>
+#include <linux/platform_data/keyboard-spear.h>
 
 /* Keyboard Registers */
 #define MODE_CTL_REG	0x00
diff --git a/trunk/arch/arm/plat-spear/include/plat/keyboard.h b/trunk/include/linux/platform_data/keyboard-spear.h
similarity index 100%
rename from trunk/arch/arm/plat-spear/include/plat/keyboard.h
rename to trunk/include/linux/platform_data/keyboard-spear.h