On Thu, 22 Jul 2010 19:59:09 GMT
Linux Kernel Mailing List <[email protected]> wrote:
> Gitweb:
> http://git.kernel.org/linus/3fea60261e73dbf4a51130d40cafcc8465b0f2c3
> Commit: 3fea60261e73dbf4a51130d40cafcc8465b0f2c3 Parent:
> c25f7b763cc35a249232ce612a36a811b0e263f9 Author: Dmitry Torokhov
> <[email protected]> AuthorDate: Tue Jul 20 20:25:35 2010 -0700
> Committer: Dmitry Torokhov <[email protected]>
> CommitDate: Tue Jul 20 20:29:48 2010 -0700
>
> Input: twl40300-keypad - fix handling of "all ground" rows
>
> The Nokia RX51 board code
> (arch/arm/mach-omap2/board-rx51-peripherals.c) defines a key map for
> the matrix keypad keyboard. The hardware seems to use all of the 8
> rows and 8 columns of the keypad, although not all possible locations
> are used.
> + KEY(4, 8, KEY_10),
> +
> KEY(5, 0, KEY_Y),
> + KEY(5, 8, KEY_11),
>
This patch, as merged, is broken. Nowhere in the kernel are KEY_10 and
KEY_11 defined.... so this causes a compile failure.
Are you sure you didn't mean KEY_F10 / KEY_F11 ?
--
Arjan van de Ven Intel Open Source Technology Centre
For development, discussion and tips for power savings,
visit http://www.lesswatts.org
On Sat, Jul 24, 2010 at 08:05:51AM -0700, Arjan van de Ven wrote:
> On Thu, 22 Jul 2010 19:59:09 GMT
> Linux Kernel Mailing List <[email protected]> wrote:
>
> > Gitweb:
> > http://git.kernel.org/linus/3fea60261e73dbf4a51130d40cafcc8465b0f2c3
> > Commit: 3fea60261e73dbf4a51130d40cafcc8465b0f2c3 Parent:
> > c25f7b763cc35a249232ce612a36a811b0e263f9 Author: Dmitry Torokhov
> > <[email protected]> AuthorDate: Tue Jul 20 20:25:35 2010 -0700
> > Committer: Dmitry Torokhov <[email protected]>
> > CommitDate: Tue Jul 20 20:29:48 2010 -0700
> >
> > Input: twl40300-keypad - fix handling of "all ground" rows
> >
> > The Nokia RX51 board code
> > (arch/arm/mach-omap2/board-rx51-peripherals.c) defines a key map for
> > the matrix keypad keyboard. The hardware seems to use all of the 8
> > rows and 8 columns of the keypad, although not all possible locations
> > are used.
>
>
>
> > + KEY(4, 8, KEY_10),
> > +
> > KEY(5, 0, KEY_Y),
> > + KEY(5, 8, KEY_11),
> >
>
> This patch, as merged, is broken. Nowhere in the kernel are KEY_10 and
> KEY_11 defined.... so this causes a compile failure.
>
> Are you sure you didn't mean KEY_F10 / KEY_F11 ?
>
Doh! You are absolutely right. The following should fix that...
--
Dmitry
Input: RX51 keymap - fix recent compile breakage
From: Dmitry Torokhov <[email protected]>
The changeset 3fea60261e73dbf4a51130d40cafcc8465b0f2c3 broke
compilation as I managed to use non-existent keycodes.
Reported-by: Arjan van de Ven <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---
arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index c5555ca..0348392 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -220,10 +220,10 @@ static int board_keymap[] = {
KEY(4, 4, KEY_LEFTCTRL),
KEY(4, 5, KEY_RIGHTALT),
KEY(4, 6, KEY_LEFTSHIFT),
- KEY(4, 8, KEY_10),
+ KEY(4, 8, KEY_F10),
KEY(5, 0, KEY_Y),
- KEY(5, 8, KEY_11),
+ KEY(5, 8, KEY_F11),
KEY(6, 0, KEY_U),