diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 22:18:29 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 22:18:29 (GMT) |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /sound/oss/harmony.c | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
| download | linux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz | |
Pull release into acpica branch
Diffstat (limited to 'sound/oss/harmony.c')
| -rw-r--r-- | sound/oss/harmony.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/harmony.c b/sound/oss/harmony.c index bee9d34..591683c 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. */ |