summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2010-06-11 15:51:39 +0000
committerHiroshi DOYU <Hiroshi.DOYU@nokia.com>2010-08-04 15:50:18 +0300
commit7b2729a15bd512180706340d9b1bf3e63fe009bf (patch)
tree48ddebeffebaf6149ea68ca795bef70e76e14cea /arch/arm
parent07d65d8b91c2f514e32014ae4b02f58cbd35820c (diff)
downloadblackbird-op-linux-7b2729a15bd512180706340d9b1bf3e63fe009bf.tar.gz
blackbird-op-linux-7b2729a15bd512180706340d9b1bf3e63fe009bf.zip
omap: mailbox: 2420 should be detected at run-time
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/mailbox.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index edcfec6ff67b..f67cb2ce35b0 100644
--- 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()) {
OpenPOWER on IntegriCloud