From 81fa824942153cf2b6d3567e75d12fc07f9a0da5 Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@mvista.com>
Date: Fri, 18 Jan 2008 17:55:08 -0800
Subject: [PATCH] --- yaml --- r: 75595 b: refs/heads/master c:
 f6f2a5db6ddf164923c1f8af27d36c2d7ab994e0 h: refs/heads/master i:   75593:
 a88d6a426d6bf43e4decae625d41ded4c44e0854   75591:
 f296bf05e0870f1adf0c944bf0b4fe471c9231a6 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-omap1/board-nokia770.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 45a6496f0b17..0e3f94139149 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 496bcb81678ae255171de54e637ba1c19c9ed315
+refs/heads/master: f6f2a5db6ddf164923c1f8af27d36c2d7ab994e0
diff --git a/trunk/arch/arm/mach-omap1/board-nokia770.c b/trunk/arch/arm/mach-omap1/board-nokia770.c
index 22db19a53647..182a98a9df4c 100644
--- a/trunk/arch/arm/mach-omap1/board-nokia770.c
+++ b/trunk/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)