diff options
| author | Ohad Ben-Cohen <ohad@wizery.com> | 2012-02-23 10:53:35 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-23 11:30:06 -0800 |
| commit | 655850ed7e3e90dcb5ae88ae63f75acbf5465213 (patch) | |
| tree | 73a4052b5a3bac59fd6f0578d5b070752fca5d81 /arch/arm | |
| parent | e4b0b2cbbbaa085103229c03820755f20a64e581 (diff) | |
| download | linux-655850ed7e3e90dcb5ae88ae63f75acbf5465213.tar.gz linux-655850ed7e3e90dcb5ae88ae63f75acbf5465213.tar.bz2 linux-655850ed7e3e90dcb5ae88ae63f75acbf5465213.zip | |
ARM: OMAP2: fix mailbox init code
Fix this:
arch/arm/mach-omap2/mailbox.c: In function 'omap2_mbox_probe':
arch/arm/mach-omap2/mailbox.c:354: error: 'omap2_mboxes' undeclared (first use in this function)
arch/arm/mach-omap2/mailbox.c:354: error: (Each undeclared identifier is reported only once
arch/arm/mach-omap2/mailbox.c:354: error: for each function it appears in.)
Which happens on CONFIG_ARCH_OMAP2 && !CONFIG_SOC_OMAP2420, due to
missing omap2_mboxes declaration.
In addition, make sure we declare the right mailbox instances for 2430.
Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 609ea2ded7e3..415a6f1cf419 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -281,8 +281,16 @@ static struct omap_mbox mbox_iva_info = { .ops = &omap2_mbox_ops, .priv = &omap2_mbox_iva_priv, }; +#endif -struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL }; +#ifdef CONFIG_ARCH_OMAP2 +struct omap_mbox *omap2_mboxes[] = { + &mbox_dsp_info, +#ifdef CONFIG_SOC_OMAP2420 + &mbox_iva_info, +#endif + NULL +}; #endif #if defined(CONFIG_ARCH_OMAP4) |