summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-09-28 16:33:53 +1000
committerMichal Simek <monstr@monstr.eu>2010-10-21 15:51:49 +1000
commit2af9ebe951bb12434e9f10cd1f0f83943ef3f54b (patch)
treec11d4d4cac46fbfb5fde0abb7f1867a7dbd3533b /arch/microblaze
parent96a5ff42298d0ea44d5aa321a56aeba280b52645 (diff)
microblaze: Rename all uartlite early printk functions
This is done because of uart16550 early printk support Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/kernel/early_printk.c14
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, ...)
{