Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[powerpc.git] / drivers / parport / parport_gsc.c

diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 02d72ac..fde29a7 100644 (file)
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -359,11 +359,12 @@ static int __devinit parport_init_chip(struct parisc_device *dev)
        unsigned long port;
 
        if (!dev->irq) {
-               printk("IRQ not found for parallel device at 0x%lx\n", dev->hpa);
+               printk(KERN_WARNING "IRQ not found for parallel device at 0x%lx\n",
+                       dev->hpa.start);
                return -ENODEV;
        }
 
-       port = dev->hpa + PARPORT_GSC_OFFSET;
+       port = dev->hpa.start + PARPORT_GSC_OFFSET;
        
        /* some older machines with ASP-chip don't support
         * the enhanced parport modes.