X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fserial%2Fmpc52xx_uart.c;h=3c4b6c24371254b1a8a6bcfa27fa922a6069fc9d;hb=85f4544fbf02f60993c76f5b92517a87f220472d;hp=6dd579ed977782d66e26465806afe5ee97f9701d;hpb=ec0bf39a471bf6fcd01def2bd677128cea940b73;p=deliverable%2Flinux.git

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 6dd579ed9777..3c4b6c243712 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -270,8 +270,8 @@ mpc52xx_uart_shutdown(struct uart_port *port)
 }
 
 static void
-mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
-                         struct termios *old)
+mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
+                         struct ktermios *old)
 {
 	struct mpc52xx_psc __iomem *psc = PSC(port);
 	unsigned long flags;
@@ -789,7 +789,9 @@ static struct console mpc52xx_console = {
 static int __init
 mpc52xx_console_init(void)
 {
+#if defined(CONFIG_PPC_MERGE)
 	mpc52xx_uart_of_enumerate();
+#endif
 	register_console(&mpc52xx_console);
 	return 0;
 }