diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /arch/arm/mach-mx3/pcm037.c | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | ||