summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/omap4-keypad.h
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-09-23 17:15:44 -0600
committerPaul Walmsley <paul@pwsan.com>2012-09-23 17:15:44 -0600
commit291852e8791a596195edc3ced96481bfd105f35b (patch)
tree5ac0d7f65cc21943863301fc50e62a616b168e8d /arch/arm/plat-omap/include/plat/omap4-keypad.h
parent2910f14584eddf2bc0db4baec3c6950ef357b52c (diff)
parentde6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff)
downloadop-kernel-dev-291852e8791a596195edc3ced96481bfd105f35b.zip
op-kernel-dev-291852e8791a596195edc3ced96481bfd105f35b.tar.gz
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for twl-core driver and to fix omap1_defconfig compile when led driver changes and omap sparse IRQ changes are merged together. Also fix warnings for omaps not using pinctrl framework yet.
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap4-keypad.h')
-rw-r--r--arch/arm/plat-omap/include/plat/omap4-keypad.h2
1 files changed, 2 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
index 8ad0a37..20de0d5 100644
--- a/arch/arm/plat-omap/include/plat/omap4-keypad.h
+++ b/arch/arm/plat-omap/include/plat/omap4-keypad.h
@@ -1,6 +1,8 @@
#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H
#define ARCH_ARM_PLAT_OMAP4_KEYPAD_H
+struct omap_board_data;
+
extern int omap4_keyboard_init(struct omap4_keypad_platform_data *,
struct omap_board_data *);
#endif
OpenPOWER on IntegriCloud