diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-10 15:10:32 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-10 15:59:01 +0100 |
| commit | e43b21cbbd816aebbb275093f22a974f7b0cb345 (patch) | |
| tree | b5ff8b657bea36337a5c49aded1217de61c29b91 /arch/arm/mach-ixp4xx/common.c | |
| parent | 2cd0f55961d87da617adae717737d13cb9518e7f (diff) | |
ARM: ixp4xx: Fix build with IXP4XX_INDIRECT_PCI
Provide *_relaxed() accessors and make sure to pass the volatile void
__iomem * to accessors rather than the value cast to a u32. This allows
ixp4xx to build with IXP4XX_INDIRECT_PCI enabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/mach-ixp4xx/common.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index fc4b7b24265e..8537d4c41e34 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c @@ -652,7 +652,7 @@ static void __iomem *ixp4xx_ioremap_caller(phys_addr_t addr, size_t size, return (void __iomem *)addr; } -static void ixp4xx_iounmap(void __iomem *addr) +static void ixp4xx_iounmap(volatile void __iomem *addr) { if (!is_pci_memory((__force u32)addr)) __iounmap(addr); |