diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/mach-mx3/mx31lite.c | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-mx3/mx31lite.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31lite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mx31lite.c b/arch/arm/mach-mx3/mx31lite.c index d363a6e79f80..c43440070143 100644 --- a/arch/arm/mach-mx3/mx31lite.c +++ b/arch/arm/mach-mx3/mx31lite.c | |||
| @@ -45,17 +45,17 @@ static struct map_desc mx31lite_io_desc[] __initdata = { | |||
| 45 | .virtual = AIPS1_BASE_ADDR_VIRT, | 45 | .virtual = AIPS1_BASE_ADDR_VIRT, |
| 46 | .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), | 46 | .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), |
| 47 | .length = AIPS1_SIZE, | 47 | .length = AIPS1_SIZE, |
| 48 | .type = MT_NONSHARED_DEVICE | 48 | .type = MT_DEVICE_NONSHARED |
| 49 | }, { | 49 | }, { |
| 50 | .virtual = SPBA0_BASE_ADDR_VIRT, | 50 | .virtual = SPBA0_BASE_ADDR_VIRT, |
| 51 | .pfn = __phys_to_pfn(SPBA0_BASE_ADDR), | 51 | .pfn = __phys_to_pfn(SPBA0_BASE_ADDR), |
| 52 | .length = SPBA0_SIZE, | 52 | .length = SPBA0_SIZE, |
| 53 | .type = MT_NONSHARED_DEVICE | 53 | .type = MT_DEVICE_NONSHARED |
| 54 | }, { | 54 | }, { |
| 55 | .virtual = AIPS2_BASE_ADDR_VIRT, | 55 | .virtual = AIPS2_BASE_ADDR_VIRT, |
| 56 | .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), | 56 | .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), |
| 57 | .length = AIPS2_SIZE, | 57 | .length = AIPS2_SIZE, |
| 58 | .type = MT_NONSHARED_DEVICE | 58 | .type = MT_DEVICE_NONSHARED |
| 59 | }, { | 59 | }, { |
| 60 | .virtual = CS4_BASE_ADDR_VIRT, | 60 | .virtual = CS4_BASE_ADDR_VIRT, |
| 61 | .pfn = __phys_to_pfn(CS4_BASE_ADDR), | 61 | .pfn = __phys_to_pfn(CS4_BASE_ADDR), |