diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/arm/mach-ixp2000/ixdp2x01.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
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 | }; |