diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2016-06-23 19:08:40 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2016-06-23 19:08:40 +0000 |
| commit | e04558cbfe61cd06d762eaaa587616798d9b65b6 (patch) | |
| tree | b29d56f9b95b62dff6bcfb8ae31928d1266fc529 /drivers/irqchip/irq-tegra.c | |
| parent | d7e3528eed85b51ddca2f281d2d4e7d687f28d60 (diff) | |
| parent | 353332855eef20dc5ae8cd42aaafb4750748f90b (diff) | |
| download | op-kernel-dev-e04558cbfe61cd06d762eaaa587616798d9b65b6.zip op-kernel-dev-e04558cbfe61cd06d762eaaa587616798d9b65b6.tar.gz | |
Merge branch 'irqchip/misc' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-tegra.c')
| -rw-r--r-- | drivers/irqchip/irq-tegra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c index e902f08..3973a14 100644 --- a/drivers/irqchip/irq-tegra.c +++ b/drivers/irqchip/irq-tegra.c @@ -90,7 +90,7 @@ static struct tegra_ictlr_info *lic; static inline void tegra_ictlr_write_mask(struct irq_data *d, unsigned long reg) { - void __iomem *base = d->chip_data; + void __iomem *base = (void __iomem __force *)d->chip_data; u32 mask; mask = BIT(d->hwirq % 32); @@ -266,7 +266,7 @@ static int tegra_ictlr_domain_alloc(struct irq_domain *domain, irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, &tegra_ictlr_chip, - info->base[ictlr]); + (void __force *)info->base[ictlr]); } parent_fwspec = *fwspec; |
