diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/serial/sunsu.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/serial/sunsu.c')
| -rw-r--r-- | drivers/serial/sunsu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 2b4f96541b8e..4cdb610cdd37 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -1295,9 +1295,9 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel) | |||
| 1295 | if (up->port.type == PORT_UNKNOWN) | 1295 | if (up->port.type == PORT_UNKNOWN) |
| 1296 | return -1; | 1296 | return -1; |
| 1297 | 1297 | ||
| 1298 | printk(KERN_INFO "su%d at 0x%p (irq = %s) is a %s\n", | 1298 | printk(KERN_INFO "su%d at 0x%p (irq = %d) is a %s\n", |
| 1299 | channel, | 1299 | channel, |
| 1300 | up->port.membase, __irq_itoa(up->port.irq), | 1300 | up->port.membase, up->port.irq, |
| 1301 | sunsu_type(&up->port)); | 1301 | sunsu_type(&up->port)); |
| 1302 | 1302 | ||
| 1303 | #ifdef CONFIG_SERIO | 1303 | #ifdef CONFIG_SERIO |