The patch titled serial: add vr41xx_siu_early_setup() for serial console has been removed from the -mm tree. Its filename was serial-add-vr41xx_siu_early_setup-for-serial-console.patch This patch was dropped because it is obsolete The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial: add vr41xx_siu_early_setup() for serial console From: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> Add vr41xx_siu_early_setup() for serial console Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/vr41xx_siu.c | 15 ++++++++++++++- include/asm-mips/vr41xx/siu.h | 8 +++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff -puN drivers/serial/vr41xx_siu.c~serial-add-vr41xx_siu_early_setup-for-serial-console drivers/serial/vr41xx_siu.c --- a/drivers/serial/vr41xx_siu.c~serial-add-vr41xx_siu_early_setup-for-serial-console +++ a/drivers/serial/vr41xx_siu.c @@ -1,7 +1,7 @@ /* * Driver for NEC VR4100 series Serial Interface Unit. * - * Copyright (C) 2004-2007 Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> + * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> * * Based on drivers/serial/8250.c, by Russell King. * @@ -840,6 +840,19 @@ static int __devinit siu_console_init(vo console_initcall(siu_console_init); +void __init vr41xx_siu_early_setup(struct uart_port *port) +{ + if (port->type == PORT_UNKNOWN) + return; + + siu_uart_ports[port->line].line = port->line; + siu_uart_ports[port->line].type = port->type; + siu_uart_ports[port->line].uartclk = SIU_BAUD_BASE * 16; + siu_uart_ports[port->line].mapbase = port->mapbase; + siu_uart_ports[port->line].mapbase = port->mapbase; + siu_uart_ports[port->line].ops = &siu_uart_ops; +} + #define SERIAL_VR41XX_CONSOLE &siu_console #else #define SERIAL_VR41XX_CONSOLE NULL diff -puN include/asm-mips/vr41xx/siu.h~serial-add-vr41xx_siu_early_setup-for-serial-console include/asm-mips/vr41xx/siu.h --- a/include/asm-mips/vr41xx/siu.h~serial-add-vr41xx_siu_early_setup-for-serial-console +++ a/include/asm-mips/vr41xx/siu.h @@ -1,7 +1,7 @@ /* * Include file for NEC VR4100 series Serial Interface Unit. * - * Copyright (C) 2005 Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> + * Copyright (C) 2005-2008 Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,4 +49,10 @@ typedef enum { extern void vr41xx_select_irda_module(irda_module_t module, irda_speed_t speed); +#ifdef CONFIG_SERIAL_VR41XX_CONSOLE +extern void vr41xx_siu_early_setup(struct uart_port *port); +#else +static inline void vr41xx_siu_early_setup(struct uart_port *port) {} +#endif + #endif /* __NEC_VR41XX_SIU_H */ _ Patches currently in -mm which might be from yoichi_yuasa@xxxxxxxxxxxxxx are origin.patch add-vr41xx_siu_early_setup-for-serial-console.patch add-vr41xx-siu-setup-for-serial-console.patch serial-add-vr41xx_siu_early_setup-for-serial-console.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html