[PATCH] ARM: OMAP: Fix 1510 compilation with DSP != m

[Jonathan McDowell <noodles@earth.li>]

Looks like recent changes have broken OMAP1510 compilation; I hit this
because I'm not using the DSP at present but during testing my fix
discovered that setting CONFIG_OMAP_DSP to Y didn't compile either; only
M worked. Patch below makes all 3 compile.

Signed-Off-By: Jonathan McDowell <noodles@earth.li>

-----
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 992a17d..adae4f8 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,7 +63,7 @@ #endif
 
 #if defined(CONFIG_OMAP_DSP)
 
-#if defined(CONFIG_ARCH_OMAP1510)
+#if defined(CONFIG_ARCH_OMAP15XX)
 #  define OMAP1_MBOX_SIZE	0x23
 #  define INT_DSP_MAILBOX1	INT_1510_DSP_MAILBOX1
 #elif defined(CONFIG_ARCH_OMAP16XX)
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 9d9d456..12ece9d 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -193,7 +193,7 @@ static int omap_mcbsp_check(unsigned int
 	return -1;
 }
 
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_DSP)
 static void omap_mcbsp_dsp_request(void)
 {
 	if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
@@ -266,7 +266,7 @@ int omap_mcbsp_request(unsigned int id)
 	if (omap_mcbsp_check(id) < 0)
 		return -EINVAL;
 
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_DSP)
 	/*
 	 * On 1510, 1610 and 1710, McBSP1 and McBSP3
 	 * are DSP public peripherals.
@@ -333,7 +333,7 @@ void omap_mcbsp_free(unsigned int id)
 	if (omap_mcbsp_check(id) < 0)
 		return;
 
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_DSP)
 	if (cpu_class_is_omap1()) {
 		if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)
 			omap_mcbsp_dsp_free();
-----

J.

-- 
                                            jid: noodles@jabber.earth.li
101 things you can't have too much of : 44
                                            - Fame.