summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-02 06:32:46 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-02 06:32:46 +0100
commitec33b309101bb2904e9fe20252f7760e254d05ec (patch)
tree13cde551f2ef845801d9e59081258572e1ac222a /drivers
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[SERIAL] Fix port numbering (diff)
downloadlinux-ec33b309101bb2904e9fe20252f7760e254d05ec.tar.xz
linux-ec33b309101bb2904e9fe20252f7760e254d05ec.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 401d94a7fe2e..0745ce782974 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1967,7 +1967,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
break;
}
- printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n",
+ printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",
+ port->dev ? port->dev->bus_id : "",
+ port->dev ? ": " : "",
drv->dev_name, port->line, address, port->irq, uart_type(port));
}