From: Tony Lindgren <tony@atomide.com>
Date: Mon, 22 Dec 2008 15:09:49 +0000 (+0200)
Subject: Reset mailbox to mainline version
X-Git-Tag: v2.6.28-omap1~56
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=4a374e24009388241649a43b89c97fc5dca15594

Reset mailbox to mainline version

This is to start using Hiroshi's branch against the mainline tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 22546d0776a..32b7af3c610 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -75,12 +75,12 @@ static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
 
 static inline unsigned int mbox_read_reg(unsigned int reg)
 {
-	return __raw_readl((void __iomem *)(mbox_base + reg));
+	return __raw_readl(mbox_base + reg);
 }
 
 static inline void mbox_write_reg(unsigned int val, unsigned int reg)
 {
-	__raw_writel(val, (void __iomem *)(mbox_base + reg));
+	__raw_writel(val, mbox_base + reg);
 }
 
 /* Mailbox H/W preparations */
diff --git a/arch/arm/plat-omap/include/mach/mailbox.h b/arch/arm/plat-omap/include/mach/mailbox.h
index 9d3994b7ff6..7cbed9332e1 100644
--- a/arch/arm/plat-omap/include/mach/mailbox.h
+++ b/arch/arm/plat-omap/include/mach/mailbox.h
@@ -61,8 +61,6 @@ struct omap_mbox {
 	void			(*err_notify)(void);
 };
 
-extern struct omap_mbox mbox_dsp_info;
-
 int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg, void *);
 void omap_mbox_init_seq(struct omap_mbox *);