[ARM] Remove MT_NONSHARED_DEVICE alias
Russell King [Sun, 7 Sep 2008 11:45:01 +0000 (12:45 +0100)]
Use MT_DEVICE_NONSHARED instead.

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

arch/arm/include/asm/mach/map.h
arch/arm/mach-mx3/mm.c
arch/arm/mach-mx3/mx31ads.c
arch/arm/mach-mx3/mx31lite.c

index 72586cd..cb1139a 100644 (file)
@@ -26,8 +26,6 @@ struct map_desc {
 #define MT_MEMORY              8
 #define MT_ROM                 9
 
-#define MT_NONSHARED_DEVICE    MT_DEVICE_NONSHARED
-
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
 #else
index 30d842b..0589b5c 100644 (file)
@@ -49,7 +49,7 @@ static struct map_desc mxc_io_desc[] __initdata = {
                .virtual        = AVIC_BASE_ADDR_VIRT,
                .pfn            = __phys_to_pfn(AVIC_BASE_ADDR),
                .length         = AVIC_SIZE,
-               .type           = MT_NONSHARED_DEVICE
+               .type           = MT_DEVICE_NONSHARED
        },
 };
 
index 60fb4e0..0cd90a9 100644 (file)
@@ -92,17 +92,17 @@ static struct map_desc mx31ads_io_desc[] __initdata = {
                .virtual        = AIPS1_BASE_ADDR_VIRT,
                .pfn            = __phys_to_pfn(AIPS1_BASE_ADDR),
                .length         = AIPS1_SIZE,
-               .type           = MT_NONSHARED_DEVICE
+               .type           = MT_DEVICE_NONSHARED
        }, {
                .virtual        = SPBA0_BASE_ADDR_VIRT,
                .pfn            = __phys_to_pfn(SPBA0_BASE_ADDR),
                .length         = SPBA0_SIZE,
-               .type           = MT_NONSHARED_DEVICE
+               .type           = MT_DEVICE_NONSHARED
        }, {
                .virtual        = AIPS2_BASE_ADDR_VIRT,
                .pfn            = __phys_to_pfn(AIPS2_BASE_ADDR),
                .length         = AIPS2_SIZE,
-               .type           = MT_NONSHARED_DEVICE
+               .type           = MT_DEVICE_NONSHARED
        }, {
                .virtual        = CS4_BASE_ADDR_VIRT,
                .pfn            = __phys_to_pfn(CS4_BASE_ADDR),
index d363a6e..c434400 100644 (file)
@@ -45,17 +45,17 @@ static struct map_desc mx31lite_io_desc[] __initdata = {
                .virtual = AIPS1_BASE_ADDR_VIRT,
                .pfn = __phys_to_pfn(AIPS1_BASE_ADDR),
                .length = AIPS1_SIZE,
-               .type = MT_NONSHARED_DEVICE
+               .type = MT_DEVICE_NONSHARED
        }, {
                .virtual = SPBA0_BASE_ADDR_VIRT,
                .pfn = __phys_to_pfn(SPBA0_BASE_ADDR),
                .length = SPBA0_SIZE,
-               .type = MT_NONSHARED_DEVICE
+               .type = MT_DEVICE_NONSHARED
        }, {
                .virtual = AIPS2_BASE_ADDR_VIRT,
                .pfn = __phys_to_pfn(AIPS2_BASE_ADDR),
                .length = AIPS2_SIZE,
-               .type = MT_NONSHARED_DEVICE
+               .type = MT_DEVICE_NONSHARED
        }, {
                .virtual = CS4_BASE_ADDR_VIRT,
                .pfn = __phys_to_pfn(CS4_BASE_ADDR),