Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 40ddeca..394413d 100644 (file)
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -281,7 +281,7 @@ static struct omap_mbox_ops omap2_mbox_ops = {
 
 /* FIXME: the following structs should be filled automatically by the user id */
 
-#if defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_ARCH_OMAP2420)
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP2)
 /* DSP */
 static struct omap_mbox2_priv omap2_mbox_dsp_priv = {
        .tx_fifo = {
@@ -306,7 +306,7 @@ struct omap_mbox mbox_dsp_info = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_OMAP3430)
+#if defined(CONFIG_ARCH_OMAP3)
 struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
 #endif
 
@@ -394,15 +394,19 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
 
        if (false)
                ;
-#if defined(CONFIG_ARCH_OMAP3430)
-       else if (cpu_is_omap3430()) {
+#if defined(CONFIG_ARCH_OMAP3)
+       else if (cpu_is_omap34xx()) {
                list = omap3_mboxes;
 
                list[0]->irq = platform_get_irq_byname(pdev, "dsp");
        }
 #endif
-#if defined(CONFIG_ARCH_OMAP2420)
-       else if (cpu_is_omap2420()) {
+#if defined(CONFIG_ARCH_OMAP2)
+       else if (cpu_is_omap2430()) {
+               list = omap2_mboxes;
+
+               list[0]->irq = platform_get_irq_byname(pdev, "dsp");
+       } else if (cpu_is_omap2420()) {
                list = omap2_mboxes;
 
                list[0]->irq = platform_get_irq_byname(pdev, "dsp");
@@ -432,9 +436,8 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
                iounmap(mbox_base);
                return ret;
        }
-       return 0;
 
-       return ret;
+       return 0;
 }
 
 static int __devexit omap2_mbox_remove(struct platform_device *pdev)