omap: mailbox: 2420 should be detected at run-time

[pandora-kernel.git] / arch / arm / mach-omap2 / mailbox.c

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index edcfec6..f67cb2c 100644 (file)
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -455,7 +455,8 @@ err_dsp:
 static int __devexit omap2_mbox_remove(struct platform_device *pdev)
 {
 #if defined(CONFIG_ARCH_OMAP2420)
-       omap_mbox_unregister(&mbox_iva_info);
+       if (cpu_is_omap2420())
+               omap_mbox_unregister(&mbox_iva_info);
 #endif
 
        if (cpu_is_omap44xx()) {