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/pxa27x.c | |
parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 9d2400b5f503..729af54991cb 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -390,7 +390,7 @@ void __init pxa27x_init_irq(void) static struct map_desc pxa27x_io_desc[] __initdata = { { /* Mem Ctl */ - .virtual = SMEMC_VIRT, + .virtual = (unsigned long)SMEMC_VIRT, .pfn = __phys_to_pfn(PXA2XX_SMEMC_BASE), .length = 0x00200000, .type = MT_DEVICE |