>From 657358cd06a3f20bef2472945991749bacef12e6 Mon Sep 17 00:00:00 2001
From: Suman Anna <s-a...@ti.com>
Date: Mon, 25 Jan 2010 18:27:21 -0600
Subject: [PATCH] omap2/3/4: mailbox: remove compiler warning

Remove a compiler warning in device-specific
mailbox module.

Signed-off-by: Suman Anna <s-a...@ti.com>
---
 arch/arm/mach-omap2/mailbox.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 2c9fd1c..8b5fc2a 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -419,8 +419,11 @@ static int __devinit omap2_mbox_probe(struct 
platform_device *pdev)
 #endif
        return 0;
 
+#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
 err_iva1:
-       omap_mbox_unregister(&mbox_dsp_info);
+       if (cpu_is_omap2420())
+               omap_mbox_unregister(&mbox_dsp_info);
+#endif
 
 err_dsp:
        iounmap(mbox_base);
-- 
1.6.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to