diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-16 13:22:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-16 13:22:23 -0700 |
| commit | 043cf3fd20a22df5957c28888f4c8d41438f2140 (patch) | |
| tree | ca0c79f43fd55a34e7694290e9d214cf59ca6819 /arch/arm/mach-integrator/integrator_cp.c | |
| parent | c081474c184b34136e09e1e335f41356a11c7b68 (diff) | |
| parent | 95220a2ea334b5ff2168cc9bf31c0e08b29bae21 (diff) | |
| download | linux-043cf3fd20a22df5957c28888f4c8d41438f2140.tar.gz linux-043cf3fd20a22df5957c28888f4c8d41438f2140.tar.bz2 linux-043cf3fd20a22df5957c28888f4c8d41438f2140.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 3b948e8c2751..e0a01eef0993 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -83,7 +83,6 @@ static struct map_desc intcp_io_desc[] __initdata = { { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K, MT_DEVICE }, { IO_ADDRESS(INTEGRATOR_DBG_BASE), INTEGRATOR_DBG_BASE, SZ_4K, MT_DEVICE }, { IO_ADDRESS(INTEGRATOR_GPIO_BASE), INTEGRATOR_GPIO_BASE, SZ_4K, MT_DEVICE }, - { 0xfc900000, 0xc9000000, SZ_4K, MT_DEVICE }, { 0xfca00000, 0xca000000, SZ_4K, MT_DEVICE }, { 0xfcb00000, 0xcb000000, SZ_4K, MT_DEVICE }, }; |