X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=sound%2Foss%2Fharmony.c;h=591683c55f2778f503429d13bbdd1c16ba814a88;hb=37e53db8aa233c65142d63b496277bf5be9c0ade;hp=bee9d344cd2652ce9f29b3145564b6d4d6f27e66;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=powerpc.git diff --git a/sound/oss/harmony.c b/sound/oss/harmony.c index bee9d344cd..591683c55f 100644 --- a/sound/oss/harmony.c +++ b/sound/oss/harmony.c @@ -1236,7 +1236,7 @@ harmony_driver_probe(struct parisc_device *dev) } /* Set the HPA of harmony */ - harmony.hpa = (struct harmony_hpa *)dev->hpa; + harmony.hpa = (struct harmony_hpa *)dev->hpa.start; harmony.dev = dev; /* Grab the ID and revision from the device */ @@ -1250,7 +1250,7 @@ harmony_driver_probe(struct parisc_device *dev) printk(KERN_INFO "Lasi Harmony Audio driver " HARMONY_VERSION ", " "h/w id %i, rev. %i at 0x%lx, IRQ %i\n", - id, rev, dev->hpa, harmony.dev->irq); + id, rev, dev->hpa.start, harmony.dev->irq); /* Make sure the control bit isn't set, although I don't think it ever is. */