summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-10-24 22:11:17 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-10-24 22:11:17 -0700
commit49327ad2bbbaf1945d5ba431522201574219d150 (patch)
tree47beb374d0cfb77d401220f20e8cece4ce4469db /arch/arm/plat-omap
parentf9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff)
parent6521d0bf984ab1cc25795d312e21c438aea8b5d5 (diff)
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/omap4-keypad.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap4-keypad.h b/arch/arm/plat-omap/include/plat/omap4-keypad.h
new file mode 100644
index 00000000000..2b1d9bc1eeb
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/omap4-keypad.h
@@ -0,0 +1,14 @@
+#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H
+#define ARCH_ARM_PLAT_OMAP4_KEYPAD_H
+
+#include <linux/input/matrix_keypad.h>
+
+struct omap4_keypad_platform_data {
+ const struct matrix_keymap_data *keymap_data;
+
+ u8 rows;
+ u8 cols;
+};
+
+extern int omap4_keyboard_init(struct omap4_keypad_platform_data *);
+#endif