diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-04 16:39:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-04 16:39:32 -0500 |
| commit | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch) | |
| tree | f16ace0ae09edab16bf6d0be9e8280dfbb7100da /arch/arm/mach-realview/realview_pb11mp.c | |
| parent | 8d9eb069eafce49307f839783e4a4673414b1fd5 (diff) | |
| parent | 5962b35c1de3254a2f03b95efd3b7854b874d7b7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/mach-realview/realview_pb11mp.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 127a3fd42ab1..2147335f66f5 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
| @@ -64,15 +64,10 @@ static struct map_desc realview_pb11mp_io_desc[] __initdata = { | |||
| 64 | .pfn = __phys_to_pfn(REALVIEW_PB11MP_GIC_DIST_BASE), | 64 | .pfn = __phys_to_pfn(REALVIEW_PB11MP_GIC_DIST_BASE), |
| 65 | .length = SZ_4K, | 65 | .length = SZ_4K, |
| 66 | .type = MT_DEVICE, | 66 | .type = MT_DEVICE, |
| 67 | }, { | 67 | }, { /* Maps the SCU, GIC CPU interface, TWD, GIC DIST */ |
| 68 | .virtual = IO_ADDRESS(REALVIEW_TC11MP_GIC_CPU_BASE), | 68 | .virtual = IO_ADDRESS(REALVIEW_TC11MP_PRIV_MEM_BASE), |
| 69 | .pfn = __phys_to_pfn(REALVIEW_TC11MP_GIC_CPU_BASE), | 69 | .pfn = __phys_to_pfn(REALVIEW_TC11MP_PRIV_MEM_BASE), |
| 70 | .length = SZ_4K, | 70 | .length = REALVIEW_TC11MP_PRIV_MEM_SIZE, |
| 71 | .type = MT_DEVICE, | ||
| 72 | }, { | ||
| 73 | .virtual = IO_ADDRESS(REALVIEW_TC11MP_GIC_DIST_BASE), | ||
| 74 | .pfn = __phys_to_pfn(REALVIEW_TC11MP_GIC_DIST_BASE), | ||
| 75 | .length = SZ_4K, | ||
| 76 | .type = MT_DEVICE, | 71 | .type = MT_DEVICE, |
| 77 | }, { | 72 | }, { |
| 78 | .virtual = IO_ADDRESS(REALVIEW_SCTL_BASE), | 73 | .virtual = IO_ADDRESS(REALVIEW_SCTL_BASE), |