aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-integrator/integrator_ap.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-09-24 07:22:02 +0000
committerArnd Bergmann <arnd@arndb.de>2012-10-09 17:27:33 +0200
commit21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e (patch)
treec60c540c4799ad412161dd11090cee815926efe7 /arch/arm/mach-integrator/integrator_ap.c
parentc6e9fbbf4c9aa837c0d39a097f96aaf4f90dfef1 (diff)
ARM: integrator: use __iomem pointers for MMIO, part 2
Due to some interesting merges in the integrator code, not all users of mmio pointers were converted before, this fixes all warnings that got introduced as a consequence. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
-rw-r--r--arch/arm/mach-integrator/integrator_ap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index d5b5435a09ae..e6617c134faf 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = {
static void __init ap_map_io(void)
{
iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
- vga_base = PCI_MEMORY_VADDR;
+ vga_base = (unsigned long)PCI_MEMORY_VADDR;
pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
}