summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-11-12 19:47:47 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-16 12:50:18 -0800
commite44dcb6c377529805bbaae505d5b333daab69111 (patch)
tree364a994a250c177c40f7a8ce3cb5eefafed03fb5 /drivers/serial
parent597c606f560cf7ef6029152fa7574bddbfb0252f (diff)
downloadlinux-e44dcb6c377529805bbaae505d5b333daab69111.tar.gz
linux-e44dcb6c377529805bbaae505d5b333daab69111.tar.bz2
linux-e44dcb6c377529805bbaae505d5b333daab69111.zip
serial: mpc52xx: make printout for type more generic
The printout for the type should be just "5xxx", so 512x users won't wonder why they have a mpc52xx-type UART. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/mpc52xx_uart.c6
1 files changed, 5 insertions, 1 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,
static const char *
mpc52xx_uart_type(struct uart_port *port)
{
- return port->type == PORT_MPC52xx ? "MPC52xx PSC" : NULL;
+ /*
+ * We keep using PORT_MPC52xx for historic reasons although it applies
+ * for MPC512x, too, but print "MPC5xxx" to not irritate users
+ */
+ return port->type == PORT_MPC52xx ? "MPC5xxx PSC" : NULL;
}
static void