---

yaml --- r: 327143 b: refs/heads/master c: 6884b68 h: refs/heads/master i: 327141: 9a203c7 327139: 1766add 327135: bb65e8d v: v3
git-mirror · Sep 19, 2012 · cc2a4af · cc2a4af
1 parent 7b3a387
commit cc2a4af
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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/...ch/arm/plat-spear/include/plat/keyboard.h → ...lude/linux/platform_data/keyboard-spear.h b/...ch/arm/plat-spear/include/plat/keyboard.h → ...lude/linux/platform_data/keyboard-spear.h