Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / mips / ar7 / platform.c

diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index c4d71fb..2ecab61 100644 (file)
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -242,13 +242,13 @@ static struct platform_device physmap_flash = {
        .num_resources = 1,
 };
 
-static u64 cpmac_dma_mask = DMA_32BIT_MASK;
+static u64 cpmac_dma_mask = DMA_BIT_MASK(32);
 static struct platform_device cpmac_low = {
        .id = 0,
        .name = "cpmac",
        .dev = {
                .dma_mask = &cpmac_dma_mask,
-               .coherent_dma_mask = DMA_32BIT_MASK,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
                .platform_data = &cpmac_low_data,
        },
        .resource = cpmac_low_res,
@@ -260,7 +260,7 @@ static struct platform_device cpmac_high = {
        .name = "cpmac",
        .dev = {
                .dma_mask = &cpmac_dma_mask,
-               .coherent_dma_mask = DMA_32BIT_MASK,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
                .platform_data = &cpmac_high_data,
        },
        .resource = cpmac_high_res,
@@ -480,6 +480,7 @@ static void __init detect_leds(void)
 static int __init ar7_register_devices(void)
 {
        int res;
+#ifdef CONFIG_SERIAL_8250
        static struct uart_port uart_port[2];
 
        memset(uart_port, 0, sizeof(struct uart_port) * 2);
@@ -511,7 +512,7 @@ static int __init ar7_register_devices(void)
                if (res)
                        return res;
        }
-
+#endif /* CONFIG_SERIAL_8250 */
        res = platform_device_register(&physmap_flash);
        if (res)
                return res;