diff options
author | Michal Simek <monstr@monstr.eu> | 2010-09-28 08:33:53 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-10-21 07:51:49 +0200 |
commit | 2af9ebe951bb12434e9f10cd1f0f83943ef3f54b (patch) | |
tree | c11d4d4cac46fbfb5fde0abb7f1867a7dbd3533b | |
parent | microblaze: remove early printk uarlite console dependency from header (diff) | |
download | linux-2af9ebe951bb12434e9f10cd1f0f83943ef3f54b.tar.xz linux-2af9ebe951bb12434e9f10cd1f0f83943ef3f54b.zip |
microblaze: Rename all uartlite early printk functions
This is done because of uart16550 early printk support
Signed-off-by: Michal Simek <monstr@monstr.eu>
-rw-r--r-- | arch/microblaze/kernel/early_printk.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c index 7de84923ba07..fa07d211adec 100644 --- a/arch/microblaze/kernel/early_printk.c +++ b/arch/microblaze/kernel/early_printk.c @@ -24,7 +24,7 @@ static u32 early_console_initialized; static u32 base_addr; -static void early_printk_putc(char c) +static void early_printk_uartlite_putc(char c) { /* * Limit how many times we'll spin waiting for TX FIFO status. @@ -45,25 +45,25 @@ static void early_printk_putc(char c) out_be32(base_addr + 4, c & 0xff); } -static void early_printk_write(struct console *unused, +static void early_printk_uartlite_write(struct console *unused, const char *s, unsigned n) { while (*s && n-- > 0) { - early_printk_putc(*s); + early_printk_uartlite_putc(*s); if (*s == '\n') - early_printk_putc('\r'); + early_printk_uartlite_putc('\r'); s++; } } -static struct console early_serial_console = { +static struct console early_serial_uartlite_console = { .name = "earlyser", - .write = early_printk_write, + .write = early_printk_uartlite_write, .flags = CON_PRINTBUFFER, .index = -1, }; -static struct console *early_console = &early_serial_console; +static struct console *early_console = &early_serial_uartlite_console; void early_printk(const char *fmt, ...) { |