From: Stuart Brady Date: Wed, 11 Jan 2006 01:47:58 +0000 (-0500) Subject: [PARISC] OSS: Fix build of parisc harmony driver X-Git-Tag: v2.6.16-rc1~428^2~9 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49efdd46eed353027096a765f40dd8af52ece5ae;p=linux-2.6 [PARISC] OSS: Fix build of parisc harmony driver OSS Harmony got missed on the conversion of parisc_device.hpa to a struct resource... fix its build. Signed-off-by: Stuart Brady Signed-off-by: Kyle McMartin --- 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. */