diff options
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 6 | ||||
-rw-r--r-- | include/linux/serial_core.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index c4399e23565a..126ec7f568ec 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -838,7 +838,11 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new, | |||
838 | static const char * | 838 | static const char * |
839 | mpc52xx_uart_type(struct uart_port *port) | 839 | mpc52xx_uart_type(struct uart_port *port) |
840 | { | 840 | { |
841 | return port->type == PORT_MPC52xx ? "MPC52xx PSC" : NULL; | 841 | /* |
842 | * We keep using PORT_MPC52xx for historic reasons although it applies | ||
843 | * for MPC512x, too, but print "MPC5xxx" to not irritate users | ||
844 | */ | ||
845 | return port->type == PORT_MPC52xx ? "MPC5xxx PSC" : NULL; | ||
842 | } | 846 | } |
843 | 847 | ||
844 | static void | 848 | static void |
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 41603d690433..9ff9b7db293b 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -95,7 +95,7 @@ | |||
95 | /* PPC CPM type number */ | 95 | /* PPC CPM type number */ |
96 | #define PORT_CPM 58 | 96 | #define PORT_CPM 58 |
97 | 97 | ||
98 | /* MPC52xx type numbers */ | 98 | /* MPC52xx (and MPC512x) type numbers */ |
99 | #define PORT_MPC52xx 59 | 99 | #define PORT_MPC52xx 59 |
100 | 100 | ||
101 | /* IBM icom */ | 101 | /* IBM icom */ |