Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / drivers / serial / sunsu.c

diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 2b4f96541b8e6a10f25a717c8909a742a0576515..0268b307c01e439e96c248cd554bb6f73a4ba462 100644 (file)
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1053,7 +1053,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
         */
        for_each_ebus(ebus) {
                for_each_ebusdev(dev, ebus) {
-                       if (dev->prom_node == up->port_node) {
+                       if (dev->prom_node->node == up->port_node) {
                                /*
                                 * The EBus is broken on sparc; it delivers
                                 * virtual addresses in resources. Oh well...
@@ -1073,7 +1073,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
 #ifdef CONFIG_SPARC64
        for_each_isa(isa_br) {
                for_each_isadev(isa_dev, isa_br) {
-                       if (isa_dev->prom_node == up->port_node) {
+                       if (isa_dev->prom_node->node == up->port_node) {
                                /* Same on sparc64. Cool architecure... */
                                up->port.membase = (char *) isa_dev->resource.start;
                                up->port.mapbase = isa_dev->resource.start;
@@ -1295,9 +1295,9 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel)
        if (up->port.type == PORT_UNKNOWN)
                return -1;
 
-       printk(KERN_INFO "su%d at 0x%p (irq = %s) is a %s\n",
+       printk(KERN_INFO "su%d at 0x%p (irq = %d) is a %s\n",
               channel,
-              up->port.membase, __irq_itoa(up->port.irq),
+              up->port.membase, up->port.irq,
               sunsu_type(&up->port));
 
 #ifdef CONFIG_SERIO