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/ixdp2x00.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x00.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 63ba0191aa65..8b4a839b6279 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
| @@ -176,7 +176,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long | |||
| 176 | *************************************************************************/ | 176 | *************************************************************************/ |
| 177 | static struct map_desc ixdp2x00_io_desc __initdata = { | 177 | static struct map_desc ixdp2x00_io_desc __initdata = { |
| 178 | .virtual = IXDP2X00_VIRT_CPLD_BASE, | 178 | .virtual = IXDP2X00_VIRT_CPLD_BASE, |
| 179 | .physical = IXDP2X00_PHYS_CPLD_BASE, | 179 | .pfn = __phys_to_pfn(IXDP2X00_PHYS_CPLD_BASE), |
| 180 | .length = IXDP2X00_CPLD_SIZE, | 180 | .length = IXDP2X00_CPLD_SIZE, |
| 181 | .type = MT_DEVICE | 181 | .type = MT_DEVICE |
| 182 | }; | 182 | }; |