projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 9880552d GKH |
1 | From 2e65a2075cc740b485ab203430bdf3459d5551b6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
| 3 | Date: Mon, 26 Jul 2010 01:12:37 -0700 | |
| 4 | Subject: Input: RX51 keymap - fix recent compile breakage | |
| 5 | ||
| 6 | From: Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
| 7 | ||
| 8 | commit 2e65a2075cc740b485ab203430bdf3459d5551b6 upstream. | |
| 9 | ||
| 10 | Commit 3fea60261e73 ("Input: twl40300-keypad - fix handling of "all | |
| 11 | ground" rows") broke compilation as I managed to use non-existent | |
| 12 | keycodes. | |
| 13 | ||
| 14 | Reported-by: Arjan van de Ven <arjan@infradead.org> | |
| 15 | Signed-off-by: Dmitry Torokhov <dtor@mail.ru> | |
| 16 | Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 18 | ||
| 19 | --- | |
| 20 | arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++-- | |
| 21 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 22 | ||
| 23 | --- a/arch/arm/mach-omap2/board-rx51-peripherals.c | |
| 24 | +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |
| 25 | @@ -82,10 +82,10 @@ static int board_keymap[] = { | |
| 26 | KEY(4, 4, KEY_LEFTCTRL), | |
| 27 | KEY(4, 5, KEY_RIGHTALT), | |
| 28 | KEY(4, 6, KEY_LEFTSHIFT), | |
| 29 | - KEY(4, 8, KEY_10), | |
| 30 | + KEY(4, 8, KEY_F10), | |
| 31 | ||
| 32 | KEY(5, 0, KEY_Y), | |
| 33 | - KEY(5, 8, KEY_11), | |
| 34 | + KEY(5, 8, KEY_F11), | |
| 35 | ||
| 36 | KEY(6, 0, KEY_U), | |
| 37 |