Merge remote-tracking branch 'omap/for-next'

[karo-tx-linux.git] / arch / x86 / kernel / early_printk.c

diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index eec40f595ab97ee74b83002a21e09a0d2c032cbb..21bf92490a7b9c8897fef3ccb3846ddd82875a70 100644 (file)
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -195,14 +195,14 @@ static __init void early_serial_init(char *s)
 #ifdef CONFIG_PCI
 static void mem32_serial_out(unsigned long addr, int offset, int value)
 {
-       u32 *vaddr = (u32 *)addr;
+       u32 __iomem *vaddr = (u32 __iomem *)addr;
        /* shift implied by pointer type */
        writel(value, vaddr + offset);
 }
 
 static unsigned int mem32_serial_in(unsigned long addr, int offset)
 {
-       u32 *vaddr = (u32 *)addr;
+       u32 __iomem *vaddr = (u32 __iomem *)addr;
        /* shift implied by pointer type */
        return readl(vaddr + offset);
 }
@@ -316,7 +316,7 @@ static struct console early_serial_console = {
        .index =        -1,
 };
 
-static inline void early_console_register(struct console *con, int keep_early)
+static void early_console_register(struct console *con, int keep_early)
 {
        if (con->index != -1) {
                printk(KERN_CRIT "ERROR: earlyprintk= %s already used\n",