[PATCH] Input: OMAP: RX51: fix 'KEY_10' compile breakage

Subsystems: arm port, omap2+ support, the rest

STALE5856d

2 messages, 2 authors, 2010-07-27 · open the first message on its own page

[PATCH] Input: OMAP: RX51: fix 'KEY_10' compile breakage

From: Paul Walmsley <paul@pwsan.com>
Date: 2010-07-26 22:28:12

Commit 3fea60261e73dbf4a51130d40cafcc8465b0f2c3 replaces KEY_F10 and 
KEY_F11 macro references with 'KEY_10' and 'KEY_11'.  This breaks 
v2.6.35-rc6 compiles with omap3_defconfig:

  CC      arch/arm/mach-omap2/board-rx51-peripherals.o
arch/arm/mach-omap2/board-rx51-peripherals.c:223: error: 'KEY_10' undeclared here (not in a function)
arch/arm/mach-omap2/board-rx51-peripherals.c:226: error: 'KEY_11' undeclared here (not in a function)

Fix by renaming the macro references back to KEY_F10 and KEY_F11.

Compile-tested only.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@kernel.org
Cc: Tony Lindgren <tony@atomide.com>
---
 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),
 
-- 
1.7.1

Re: [PATCH] Input: OMAP: RX51: fix 'KEY_10' compile breakage

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2010-07-27 16:43:33

Hi Paul,

On Mon, Jul 26, 2010 at 04:28:12PM -0600, Paul Walmsley wrote:
Commit 3fea60261e73dbf4a51130d40cafcc8465b0f2c3 replaces KEY_F10 and 
KEY_F11 macro references with 'KEY_10' and 'KEY_11'.  This breaks 
v2.6.35-rc6 compiles with omap3_defconfig:

  CC      arch/arm/mach-omap2/board-rx51-peripherals.o
arch/arm/mach-omap2/board-rx51-peripherals.c:223: error: 'KEY_10' undeclared here (not in a function)
arch/arm/mach-omap2/board-rx51-peripherals.c:226: error: 'KEY_11' undeclared here (not in a function)

Fix by renaming the macro references back to KEY_F10 and KEY_F11.

Compile-tested only.
Thank you for the patch however Linus managed to fish off LKML and apply
another version that I posted earlier.

-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help