diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-03 05:06:35 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-03 05:06:35 -0500 |
commit | ca82d85bc2512b759ff6356300b46e6de5b106da (patch) | |
tree | 5675fad370cb4b38784f531d532fd5ffccdc4701 | |
parent | 06024f217d607369f0ee0071034ebb03071d5fb2 (diff) |
[ARM] Fix more 3016/1 breakage
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-clps711x/edb7211-mm.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/enp2611.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-clps711x/edb7211-mm.c b/arch/arm/mach-clps711x/edb7211-mm.c index 72f8bb05d55e..0d52e0851251 100644 --- a/arch/arm/mach-clps711x/edb7211-mm.c +++ b/arch/arm/mach-clps711x/edb7211-mm.c | |||
@@ -55,22 +55,22 @@ static struct map_desc edb7211_io_desc[] __initdata = { | |||
55 | .virtual = EP7211_VIRT_EXTKBD, | 55 | .virtual = EP7211_VIRT_EXTKBD, |
56 | .pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD), | 56 | .pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD), |
57 | .length = SZ_1M, | 57 | .length = SZ_1M, |
58 | .type - MT_DEVICE | 58 | .type = MT_DEVICE, |
59 | }, { /* and CS8900A Ethernet chip */ | 59 | }, { /* and CS8900A Ethernet chip */ |
60 | .virtual = EP7211_VIRT_CS8900A, | 60 | .virtual = EP7211_VIRT_CS8900A, |
61 | .pfn = __phys_to_pfn(EP7211_PHYS_CS8900A), | 61 | .pfn = __phys_to_pfn(EP7211_PHYS_CS8900A), |
62 | .length = SZ_1M, | 62 | .length = SZ_1M, |
63 | .type = MT_DEVICE | 63 | .type = MT_DEVICE, |
64 | }, { /* flash banks */ | 64 | }, { /* flash banks */ |
65 | .virtual = EP7211_VIRT_FLASH1, | 65 | .virtual = EP7211_VIRT_FLASH1, |
66 | .pfn = __phys_to_pfn(EP7211_PHYS_FLASH1), | 66 | .pfn = __phys_to_pfn(EP7211_PHYS_FLASH1), |
67 | .length = SZ_8M, | 67 | .length = SZ_8M, |
68 | .type = MT_DEVICE | 68 | .type = MT_DEVICE, |
69 | }, { | 69 | }, { |
70 | .virtual = EP7211_VIRT_FLASH2, | 70 | .virtual = EP7211_VIRT_FLASH2, |
71 | .pfn = __phys_to_pfn(EP7211_PHYS_FLASH2), | 71 | .pfn = __phys_to_pfn(EP7211_PHYS_FLASH2), |
72 | .length = SZ_8M, | 72 | .length = SZ_8M, |
73 | .type = MT_DEVICE | 73 | .type = MT_DEVICE, |
74 | } | 74 | } |
75 | }; | 75 | }; |
76 | 76 | ||
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c index 7719c478aa84..61f6006241bd 100644 --- a/arch/arm/mach-ixp2000/enp2611.c +++ b/arch/arm/mach-ixp2000/enp2611.c | |||
@@ -69,19 +69,19 @@ static struct sys_timer enp2611_timer = { | |||
69 | static struct map_desc enp2611_io_desc[] __initdata = { | 69 | static struct map_desc enp2611_io_desc[] __initdata = { |
70 | { | 70 | { |
71 | .virtual = ENP2611_CALEB_VIRT_BASE, | 71 | .virtual = ENP2611_CALEB_VIRT_BASE, |
72 | .physical = ENP2611_CALEB_PHYS_BASE, | 72 | .pfn = __phys_to_pfn(ENP2611_CALEB_PHYS_BASE), |
73 | .length = ENP2611_CALEB_SIZE, | 73 | .length = ENP2611_CALEB_SIZE, |
74 | .type = MT_IXP2000_DEVICE | 74 | .type = MT_IXP2000_DEVICE, |
75 | }, { | 75 | }, { |
76 | .virtual = ENP2611_PM3386_0_VIRT_BASE, | 76 | .virtual = ENP2611_PM3386_0_VIRT_BASE, |
77 | .physical = ENP2611_PM3386_0_PHYS_BASE, | 77 | .pfn = __phys_to_pfn(ENP2611_PM3386_0_PHYS_BASE), |
78 | .length = ENP2611_PM3386_0_SIZE, | 78 | .length = ENP2611_PM3386_0_SIZE, |
79 | .type = MT_IXP2000_DEVICE | 79 | .type = MT_IXP2000_DEVICE, |
80 | }, { | 80 | }, { |
81 | .virtual = ENP2611_PM3386_1_VIRT_BASE, | 81 | .virtual = ENP2611_PM3386_1_VIRT_BASE, |
82 | .physical = ENP2611_PM3386_1_PHYS_BASE, | 82 | .pfn = __phys_to_pfn(ENP2611_PM3386_1_PHYS_BASE), |
83 | .length = ENP2611_PM3386_1_SIZE, | 83 | .length = ENP2611_PM3386_1_SIZE, |
84 | .type = MT_IXP2000_DEVICE | 84 | .type = MT_IXP2000_DEVICE, |
85 | } | 85 | } |
86 | }; | 86 | }; |
87 | 87 | ||