Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  ARM: OMAP1: Fix compile for board-nokia770
  ARM: OMAP1: Keymap fix for f-sample and p2-sample

3 files changed, 14 insertions, 18 deletions

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index f65baa95986e..d5f6ea14fc7b 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -40,31 +40,29 @@ static int fsample_keymap[] = {
         KEY(0,1,KEY_RIGHT),
         KEY(0,2,KEY_LEFT),
         KEY(0,3,KEY_DOWN),
-        KEY(0,4,KEY_CENTER),
-        KEY(0,5,KEY_0_5),
-        KEY(1,0,KEY_SOFT2),
+        KEY(0,4,KEY_ENTER),
+        KEY(1,0,KEY_F10),
         KEY(1,1,KEY_SEND),
         KEY(1,2,KEY_END),
         KEY(1,3,KEY_VOLUMEDOWN),
         KEY(1,4,KEY_VOLUMEUP),
         KEY(1,5,KEY_RECORD),
-        KEY(2,0,KEY_SOFT1),
+        KEY(2,0,KEY_F9),
         KEY(2,1,KEY_3),
         KEY(2,2,KEY_6),
         KEY(2,3,KEY_9),
-        KEY(2,4,KEY_SHARP),
-        KEY(2,5,KEY_2_5),
+        KEY(2,4,KEY_KPDOT),
         KEY(3,0,KEY_BACK),
         KEY(3,1,KEY_2),
         KEY(3,2,KEY_5),
         KEY(3,3,KEY_8),
         KEY(3,4,KEY_0),
-        KEY(3,5,KEY_HEADSETHOOK),
+        KEY(3,5,KEY_KPSLASH),
         KEY(4,0,KEY_HOME),
         KEY(4,1,KEY_1),
         KEY(4,2,KEY_4),
         KEY(4,3,KEY_7),
-        KEY(4,4,KEY_STAR),
+        KEY(4,4,KEY_KPASTERISK),
         KEY(4,5,KEY_POWER),
         0
 };
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 22db19a53647..182a98a9df4c 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -36,8 +36,6 @@
 #include <asm/arch/omapfb.h>
 #include <asm/arch/lcd_mipid.h>
 
-#include "../plat-omap/dsp/dsp_common.h"
-
 #define ADS7846_PENDOWN_GPIO    15
 
 static void __init omap_nokia770_init_irq(void)
@@ -318,6 +316,8 @@ static __init int omap_dsp_init(void)
  out:
         return ret;
 }
+#else
+#define omap_dsp_init()         do {} while (0)
 #endif  /* CONFIG_OMAP_DSP */
 
 static void __init omap_nokia770_init(void)
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 1d5c8d509722..e44437e10eef 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -39,31 +39,29 @@ static int p2_keymap[] = {
         KEY(0,1,KEY_RIGHT),
         KEY(0,2,KEY_LEFT),
         KEY(0,3,KEY_DOWN),
-        KEY(0,4,KEY_CENTER),
-        KEY(0,5,KEY_0_5),
-        KEY(1,0,KEY_SOFT2),
+        KEY(0,4,KEY_ENTER),
+        KEY(1,0,KEY_F10),
         KEY(1,1,KEY_SEND),
         KEY(1,2,KEY_END),
         KEY(1,3,KEY_VOLUMEDOWN),
         KEY(1,4,KEY_VOLUMEUP),
         KEY(1,5,KEY_RECORD),
-        KEY(2,0,KEY_SOFT1),
+        KEY(2,0,KEY_F9),
         KEY(2,1,KEY_3),
         KEY(2,2,KEY_6),
         KEY(2,3,KEY_9),
-        KEY(2,4,KEY_SHARP),
-        KEY(2,5,KEY_2_5),
+        KEY(2,4,KEY_KPDOT),
         KEY(3,0,KEY_BACK),
         KEY(3,1,KEY_2),
         KEY(3,2,KEY_5),
         KEY(3,3,KEY_8),
         KEY(3,4,KEY_0),
-        KEY(3,5,KEY_HEADSETHOOK),
+        KEY(3,5,KEY_KPSLASH),
         KEY(4,0,KEY_HOME),
         KEY(4,1,KEY_1),
         KEY(4,2,KEY_4),
         KEY(4,3,KEY_7),
-        KEY(4,4,KEY_STAR),
+        KEY(4,4,KEY_KPASTERISK),
         KEY(4,5,KEY_POWER),
         0
 };