From 74aedc25b8476a0d6118ebd5123a77d1f6331713 Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Thu, 11 Jun 2009 13:38:57 +0100 Subject: [PATCH] --- yaml --- r: 146281 b: refs/heads/master c: 7de7c55bf54dede2bd2262349fc7b558bcc8e413 h: refs/heads/master i: 146279: 0621d94c88cc435d4f4e5b3836cfdf2c91568368 v: v3 --- [refs] | 2 +- trunk/drivers/serial/bfin_5xx.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bcdfc85a337d..f2a30ca9fe80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8516c568f25666a012ec4c859e640a76fc9b6ec0 +refs/heads/master: 7de7c55bf54dede2bd2262349fc7b558bcc8e413 diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c index 65a4c07f6199..dfae22d47bf7 100644 --- a/trunk/drivers/serial/bfin_5xx.c +++ b/trunk/drivers/serial/bfin_5xx.c @@ -1272,12 +1272,17 @@ static __init void early_serial_write(struct console *con, const char *s, } } +/* + * This should have a .setup or .early_setup in it, but then things get called + * without the command line options, and the baud rate gets messed up - so + * don't let the common infrastructure play with things. (see calls to setup + * & earlysetup in ./kernel/printk.c:register_console() + */ static struct __initdata console bfin_early_serial_console = { .name = "early_BFuart", .write = early_serial_write, .device = uart_console_device, .flags = CON_PRINTBUFFER, - .setup = bfin_serial_console_setup, .index = -1, .data = &bfin_serial_reg, };