diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 14:08:48 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 14:08:48 +0900 |
| commit | 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb (patch) | |
| tree | c2ba5f76da4ad86538c5fc9a2a410efa094c1e85 /drivers/sh/intc/chip.c | |
| parent | cf7599322a6052dae7353f6d986eae06dc7759f5 (diff) | |
sh: Fix up more fallout from pointless ARM __iomem churn.
It was already pointed out how to fix these cases before the offending
patches were merged, but unsurprisingly, that didn't happen. As this
change is entirely superfluous to begin with, simply shut things up by
casting everything away.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh/intc/chip.c')
| -rw-r--r-- | drivers/sh/intc/chip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c index 012df2676a26..46427b48e2f1 100644 --- a/drivers/sh/intc/chip.c +++ b/drivers/sh/intc/chip.c @@ -83,7 +83,7 @@ static void intc_mask_ack(struct irq_data *data) unsigned int irq = data->irq; struct intc_desc_int *d = get_intc_desc(irq); unsigned long handle = intc_get_ack_handle(irq); - unsigned long addr; + void __iomem *addr; intc_disable(data); @@ -91,7 +91,7 @@ static void intc_mask_ack(struct irq_data *data) if (handle) { unsigned int value; - addr = INTC_REG(d, _INTC_ADDR_D(handle), 0); + addr = (void __iomem *)INTC_REG(d, _INTC_ADDR_D(handle), 0); value = intc_set_field_from_handle(0, 1, handle); switch (_INTC_FN(handle)) { |