[ARM] Fix more 3016/1 breakage

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-clps711x/edb7211-mm.c b/arch/arm/mach-clps711x/edb7211-mm.c
index 72f8bb05d55e896c9ccbacc7cec82c3a2d2142a8..0d52e08512510913783bc00bd5f5ed4682f8e803 100644 (file)
--- 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 = {
                .virtual        = EP7211_VIRT_EXTKBD,
                .pfn            = __phys_to_pfn(EP7211_PHYS_EXTKBD),
                .length         = SZ_1M,
-               .type           - MT_DEVICE
+               .type           = MT_DEVICE,
        }, {    /* and CS8900A Ethernet chip */
                .virtual        = EP7211_VIRT_CS8900A,
                .pfn            = __phys_to_pfn(EP7211_PHYS_CS8900A),
                .length         = SZ_1M,
-               .type           = MT_DEVICE
+               .type           = MT_DEVICE,
        }, {    /* flash banks */
                .virtual        = EP7211_VIRT_FLASH1,
                .pfn            = __phys_to_pfn(EP7211_PHYS_FLASH1),
                .length         = SZ_8M,
-               .type           = MT_DEVICE
+               .type           = MT_DEVICE,
        }, {
                .virtual        = EP7211_VIRT_FLASH2,
                .pfn            = __phys_to_pfn(EP7211_PHYS_FLASH2),
                .length         = SZ_8M,
-               .type           = MT_DEVICE
+               .type           = MT_DEVICE,
        }
 };
 

diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index 7719c478aa84b6d44ac9230ac96d1ea71a7400bf..61f6006241bd9d3ba3548de387cdf531e23e80f3 100644 (file)
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -69,19 +69,19 @@ static struct sys_timer enp2611_timer = {
 static struct map_desc enp2611_io_desc[] __initdata = {
        {
                .virtual        = ENP2611_CALEB_VIRT_BASE,
-               .physical       = ENP2611_CALEB_PHYS_BASE,
+               .pfn            = __phys_to_pfn(ENP2611_CALEB_PHYS_BASE),
                .length         = ENP2611_CALEB_SIZE,
-               .type           = MT_IXP2000_DEVICE
+               .type           = MT_IXP2000_DEVICE,
        }, {
                .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,
-               .type           = MT_IXP2000_DEVICE
+               .type           = MT_IXP2000_DEVICE,
        }, {
                .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,
-               .type           = MT_IXP2000_DEVICE
+               .type           = MT_IXP2000_DEVICE,
        }
 };