Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / devices.c

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index adae4f80d2fb2ca224f04e3bfd0fb5407552906b..497c8bb5e69b5b47853672a47c4b3b21eb49d451 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -61,7 +61,7 @@ static void omap_init_rtc(void)
 static inline void omap_init_rtc(void) {}
 #endif
 
-#if defined(CONFIG_OMAP_DSP)
+#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
 
 #if defined(CONFIG_ARCH_OMAP15XX)
 #  define OMAP1_MBOX_SIZE      0x23