Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

[sfrench/cifs-2.6.git] / drivers / serial / 8250_early.c

diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
index 38776e8b064b07f57f8815709efd70defeb9d4ca..f279745e9fefe9f07114923d58ebaec052dda4cf 100644 (file)
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
@@ -153,10 +153,10 @@ static int __init parse_options(struct early_serial8250_device *device,
                        (void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE);
                port->membase += port->mapbase & ~PAGE_MASK;
 #else
-               port->membase = ioremap(port->mapbase, 64);
+               port->membase = ioremap_nocache(port->mapbase, 64);
                if (!port->membase) {
                        printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n",
-                               __FUNCTION__,
+                               __func__,
                               (unsigned long long)port->mapbase);
                        return -ENOMEM;
                }