diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/mach-pxa/cm-x2xx.c | |
parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx.c')
-rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index 13cf518bbbf..4f07e160cac 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c @@ -39,7 +39,7 @@ extern void cmx270_init(void); #define CMX2XX_NR_IRQS (IRQ_BOARD_START + 40) /* virtual addresses for statically mapped regions */ -#define CMX2XX_VIRT_BASE (0xe8000000) +#define CMX2XX_VIRT_BASE (void __iomem *)(0xe8000000) #define CMX2XX_IT8152_VIRT (CMX2XX_VIRT_BASE) /* physical address if local-bus attached devices */ @@ -482,7 +482,7 @@ static void __init cmx2xx_init_irq(void) /* Map PCI companion statically */ static struct map_desc cmx2xx_io_desc[] __initdata = { [0] = { /* PCI bridge */ - .virtual = CMX2XX_IT8152_VIRT, + .virtual = (unsigned long)CMX2XX_IT8152_VIRT, .pfn = __phys_to_pfn(PXA_CS4_PHYS), .length = SZ_64M, .type = MT_DEVICE |