diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
| commit | c33d4326b60a3aea5cd070a365043f488f81a3b0 (patch) | |
| tree | 22732738445e6293a15f5408945784d1c2fd7019 /arch/arm/plat-omap/include/plat/omap4-keypad.h | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| parent | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 (diff) | |
Merge branch 'omap/board' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/board
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap4-keypad.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap4-keypad.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap4-keypad.h b/arch/arm/plat-omap/include/plat/omap4-keypad.h index 2b1d9bc1eeb..9fe6c878323 100644 --- a/arch/arm/plat-omap/include/plat/omap4-keypad.h +++ b/arch/arm/plat-omap/include/plat/omap4-keypad.h @@ -10,5 +10,6 @@ struct omap4_keypad_platform_data { u8 cols; }; -extern int omap4_keyboard_init(struct omap4_keypad_platform_data *); +extern int omap4_keyboard_init(struct omap4_keypad_platform_data *, + struct omap_board_data *); #endif |