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>

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 */

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 *);