diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
| commit | 90accd6fabf9b2fa2705945a4c601877a75d43bf (patch) | |
| tree | d393cb54f0228b1313139e4e14adf4f5cf236b59 /arch/arm/mach-mx3/pcm037.c | |
| parent | b43d196c4d3fe46d6dda7c987c47792612b80b1b (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/arm/mach-mx3/pcm037.c')
| -rw-r--r-- | arch/arm/mach-mx3/pcm037.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c index 11fda95c86a5..843f68c8ead1 100644 --- a/arch/arm/mach-mx3/pcm037.c +++ b/arch/arm/mach-mx3/pcm037.c | |||
| @@ -91,12 +91,12 @@ static struct map_desc pcm037_io_desc[] __initdata = { | |||
| 91 | .virtual = AIPS1_BASE_ADDR_VIRT, | 91 | .virtual = AIPS1_BASE_ADDR_VIRT, |
| 92 | .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), | 92 | .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), |
| 93 | .length = AIPS1_SIZE, | 93 | .length = AIPS1_SIZE, |
| 94 | .type = MT_DEVICE | 94 | .type = MT_DEVICE_NONSHARED |
| 95 | }, { | 95 | }, { |
| 96 | .virtual = AIPS2_BASE_ADDR_VIRT, | 96 | .virtual = AIPS2_BASE_ADDR_VIRT, |
| 97 | .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), | 97 | .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), |
| 98 | .length = AIPS2_SIZE, | 98 | .length = AIPS2_SIZE, |
| 99 | .type = MT_DEVICE | 99 | .type = MT_DEVICE_NONSHARED |
| 100 | }, | 100 | }, |
| 101 | }; | 101 | }; |
| 102 | 102 | ||