diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /arch/arm/mach-ixp2000/ixdp2x01.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x01.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x01.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 7a5109921287..fee1d7b73503 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c | |||
| @@ -136,7 +136,7 @@ void __init ixdp2x01_init_irq(void) | |||
| 136 | *************************************************************************/ | 136 | *************************************************************************/ |
| 137 | static struct map_desc ixdp2x01_io_desc __initdata = { | 137 | static struct map_desc ixdp2x01_io_desc __initdata = { |
| 138 | .virtual = IXDP2X01_VIRT_CPLD_BASE, | 138 | .virtual = IXDP2X01_VIRT_CPLD_BASE, |
| 139 | .physical = IXDP2X01_PHYS_CPLD_BASE, | 139 | .pfn = __phys_to_pfn(IXDP2X01_PHYS_CPLD_BASE), |
| 140 | .length = IXDP2X01_CPLD_REGION_SIZE, | 140 | .length = IXDP2X01_CPLD_REGION_SIZE, |
| 141 | .type = MT_DEVICE | 141 | .type = MT_DEVICE |
| 142 | }; | 142 | }; |