linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: OMAP: RX51: fix 'KEY_10' compile breakage
@ 2010-07-26 22:28 Paul Walmsley
  2010-07-27 16:43 ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Walmsley @ 2010-07-26 22:28 UTC (permalink / raw)
  To: Dmitry Torokhov, Tony Lindgren
  Cc: Laurent Pinchart, Amit Kucheria, linux-input, linux-omap, stable


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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Input: OMAP: RX51: fix 'KEY_10' compile breakage
  2010-07-26 22:28 [PATCH] Input: OMAP: RX51: fix 'KEY_10' compile breakage Paul Walmsley
@ 2010-07-27 16:43 ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2010-07-27 16:43 UTC (permalink / raw)
  To: Paul Walmsley
  Cc: Tony Lindgren, Laurent Pinchart, Amit Kucheria, linux-input,
	linux-omap, stable

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-27 16:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-26 22:28 [PATCH] Input: OMAP: RX51: fix 'KEY_10' compile breakage Paul Walmsley
2010-07-27 16:43 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).