Commit ca82d85b authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Fix more 3016/1 breakage

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 06024f21
...@@ -55,22 +55,22 @@ static struct map_desc edb7211_io_desc[] __initdata = { ...@@ -55,22 +55,22 @@ static struct map_desc edb7211_io_desc[] __initdata = {
.virtual = EP7211_VIRT_EXTKBD, .virtual = EP7211_VIRT_EXTKBD,
.pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD), .pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD),
.length = SZ_1M, .length = SZ_1M,
.type - MT_DEVICE .type = MT_DEVICE,
}, { /* and CS8900A Ethernet chip */ }, { /* and CS8900A Ethernet chip */
.virtual = EP7211_VIRT_CS8900A, .virtual = EP7211_VIRT_CS8900A,
.pfn = __phys_to_pfn(EP7211_PHYS_CS8900A), .pfn = __phys_to_pfn(EP7211_PHYS_CS8900A),
.length = SZ_1M, .length = SZ_1M,
.type = MT_DEVICE .type = MT_DEVICE,
}, { /* flash banks */ }, { /* flash banks */
.virtual = EP7211_VIRT_FLASH1, .virtual = EP7211_VIRT_FLASH1,
.pfn = __phys_to_pfn(EP7211_PHYS_FLASH1), .pfn = __phys_to_pfn(EP7211_PHYS_FLASH1),
.length = SZ_8M, .length = SZ_8M,
.type = MT_DEVICE .type = MT_DEVICE,
}, { }, {
.virtual = EP7211_VIRT_FLASH2, .virtual = EP7211_VIRT_FLASH2,
.pfn = __phys_to_pfn(EP7211_PHYS_FLASH2), .pfn = __phys_to_pfn(EP7211_PHYS_FLASH2),
.length = SZ_8M, .length = SZ_8M,
.type = MT_DEVICE .type = MT_DEVICE,
} }
}; };
......
...@@ -69,19 +69,19 @@ static struct sys_timer enp2611_timer = { ...@@ -69,19 +69,19 @@ static struct sys_timer enp2611_timer = {
static struct map_desc enp2611_io_desc[] __initdata = { static struct map_desc enp2611_io_desc[] __initdata = {
{ {
.virtual = ENP2611_CALEB_VIRT_BASE, .virtual = ENP2611_CALEB_VIRT_BASE,
.physical = ENP2611_CALEB_PHYS_BASE, .pfn = __phys_to_pfn(ENP2611_CALEB_PHYS_BASE),
.length = ENP2611_CALEB_SIZE, .length = ENP2611_CALEB_SIZE,
.type = MT_IXP2000_DEVICE .type = MT_IXP2000_DEVICE,
}, { }, {
.virtual = ENP2611_PM3386_0_VIRT_BASE, .virtual = ENP2611_PM3386_0_VIRT_BASE,
.physical = ENP2611_PM3386_0_PHYS_BASE, .pfn = __phys_to_pfn(ENP2611_PM3386_0_PHYS_BASE),
.length = ENP2611_PM3386_0_SIZE, .length = ENP2611_PM3386_0_SIZE,
.type = MT_IXP2000_DEVICE .type = MT_IXP2000_DEVICE,
}, { }, {
.virtual = ENP2611_PM3386_1_VIRT_BASE, .virtual = ENP2611_PM3386_1_VIRT_BASE,
.physical = ENP2611_PM3386_1_PHYS_BASE, .pfn = __phys_to_pfn(ENP2611_PM3386_1_PHYS_BASE),
.length = ENP2611_PM3386_1_SIZE, .length = ENP2611_PM3386_1_SIZE,
.type = MT_IXP2000_DEVICE .type = MT_IXP2000_DEVICE,
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment