Merge tag 'regulator-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / arch / arm / mach-ixp4xx / ixp4xx_qmgr.c

diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
index 7c0584e0ab877aad42c50314e39b4a7316c4a078..9d1b6b7c394cfb5eb5ef2968065f97b5f2b875a7 100644 (file)
--- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <mach/qmgr.h>
 
-static const struct qmgr_regs __iomem *qmgr_regs = (void __iomem *)IXP4XX_QMGR_BASE_VIRT;
+static struct qmgr_regs __iomem *qmgr_regs = IXP4XX_QMGR_BASE_VIRT;
 static struct resource *mem_res;
 static spinlock_t qmgr_lock;
 static u32 used_sram_bitmap[4]; /* 128 16-dword pages */
@@ -32,7 +32,7 @@ void qmgr_set_irq(unsigned int queue, int src,
 
        spin_lock_irqsave(&qmgr_lock, flags);
        if (queue < HALF_QUEUES) {
-               const u32 __iomem *reg;
+               u32 __iomem *reg;
                int bit;
                BUG_ON(src > QUEUE_IRQ_SRC_NOT_FULL);
                reg = &qmgr_regs->irqsrc[queue >> 3]; /* 8 queues per u32 */