projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull trivial into release branch
[deliverable/linux.git]
/
drivers
/
serial
/
mpc52xx_uart.c
diff --git
a/drivers/serial/mpc52xx_uart.c
b/drivers/serial/mpc52xx_uart.c
index 6dd579ed977782d66e26465806afe5ee97f9701d..3c4b6c24371254b1a8a6bcfa27fa922a6069fc9d 100644
(file)
--- 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
}
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
k
termios *new,
+ struct
k
termios *old)
{
struct mpc52xx_psc __iomem *psc = PSC(port);
unsigned long flags;
{
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)
{
static int __init
mpc52xx_console_init(void)
{
+#if defined(CONFIG_PPC_MERGE)
mpc52xx_uart_of_enumerate();
mpc52xx_uart_of_enumerate();
+#endif
register_console(&mpc52xx_console);
return 0;
}
register_console(&mpc52xx_console);
return 0;
}
This page took
0.025092 seconds
and
5
git commands to generate.