Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

[karo-tx-linux.git] / drivers / serial / 8250_gsc.c

diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c
index 431aa5761a7a5791992a90e7c0d3d3f9731d6501..8b4947933d9bcf74d4717a030ec1dd4935d77e4b 100644 (file)
--- a/drivers/serial/8250_gsc.c
+++ b/drivers/serial/8250_gsc.c
@@ -29,7 +29,6 @@
 static int __init 
 serial_init_chip(struct parisc_device *dev)
 {
-       static int serial_line_nr;
        struct uart_port port;
        unsigned long address;
        int err;
@@ -42,12 +41,13 @@ serial_init_chip(struct parisc_device *dev)
                 */
                if (parisc_parent(dev)->id.hw_type != HPHW_IOA) {
                        printk(KERN_INFO "Serial: device 0x%lx not configured.\n"
-                               "Enable support for Wax, Lasi, Asp or Dino.\n", dev->hpa);
+                               "Enable support for Wax, Lasi, Asp or Dino.\n",
+                               dev->hpa.start);
                }
                return -ENODEV;
        }
 
-       address = dev->hpa;
+       address = dev->hpa.start;
        if (dev->id.sversion != 0x8d) {
                address += 0x800;
        }