diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:32:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:32:46 -0500 |
| commit | ec33b309101bb2904e9fe20252f7760e254d05ec (patch) | |
| tree | 13cde551f2ef845801d9e59081258572e1ac222a /drivers | |
| parent | 7f36b1e9582c06d0ddef5f2416c9b17017647d1f (diff) | |
| parent | 913ade51eca369553a8ffbdaf1f426fade84f6ae (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial_core.c | 4 |
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) | |||
| 1967 | break; | 1967 | break; |
| 1968 | } | 1968 | } |
| 1969 | 1969 | ||
| 1970 | printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n", | 1970 | printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n", |
| 1971 | port->dev ? port->dev->bus_id : "", | ||
| 1972 | port->dev ? ": " : "", | ||
| 1971 | drv->dev_name, port->line, address, port->irq, uart_type(port)); | 1973 | drv->dev_name, port->line, address, port->irq, uart_type(port)); |
| 1972 | } | 1974 | } |
| 1973 | 1975 | ||