diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 16:26:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 16:26:37 -0400 |
| commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
| tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/mach-mmp/common.c | |
| parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
| parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) | |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-mmp/common.c')
| -rw-r--r-- | arch/arm/mach-mmp/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/common.c b/arch/arm/mach-mmp/common.c index 0ec0ca80bb3e..5720674739f0 100644 --- a/arch/arm/mach-mmp/common.c +++ b/arch/arm/mach-mmp/common.c | |||
| @@ -27,12 +27,12 @@ EXPORT_SYMBOL(mmp_chip_id); | |||
| 27 | static struct map_desc standard_io_desc[] __initdata = { | 27 | static struct map_desc standard_io_desc[] __initdata = { |
| 28 | { | 28 | { |
| 29 | .pfn = __phys_to_pfn(APB_PHYS_BASE), | 29 | .pfn = __phys_to_pfn(APB_PHYS_BASE), |
| 30 | .virtual = APB_VIRT_BASE, | 30 | .virtual = (unsigned long)APB_VIRT_BASE, |
| 31 | .length = APB_PHYS_SIZE, | 31 | .length = APB_PHYS_SIZE, |
| 32 | .type = MT_DEVICE, | 32 | .type = MT_DEVICE, |
| 33 | }, { | 33 | }, { |
| 34 | .pfn = __phys_to_pfn(AXI_PHYS_BASE), | 34 | .pfn = __phys_to_pfn(AXI_PHYS_BASE), |
| 35 | .virtual = AXI_VIRT_BASE, | 35 | .virtual = (unsigned long)AXI_VIRT_BASE, |
| 36 | .length = AXI_PHYS_SIZE, | 36 | .length = AXI_PHYS_SIZE, |
| 37 | .type = MT_DEVICE, | 37 | .type = MT_DEVICE, |
| 38 | }, | 38 | }, |