diff options
author | Stuart Brady <sdb@parisc-linux.org> | 2006-01-10 20:47:58 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@duet.int.mcmartin.ca> | 2006-01-10 21:52:19 -0500 |
commit | 49efdd46eed353027096a765f40dd8af52ece5ae (patch) | |
tree | 1323c4d264f05980f029f7868581cf18746edbdc | |
parent | 5cdb8205e917c09fd1348e4b22e26492e8c45b36 (diff) |
[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 <sdb@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
-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 bee9d344cd26..591683c55f27 100644 --- a/sound/oss/harmony.c +++ b/sound/oss/harmony.c | |||
@@ -1236,7 +1236,7 @@ harmony_driver_probe(struct parisc_device *dev) | |||
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | /* Set the HPA of harmony */ | 1238 | /* Set the HPA of harmony */ |
1239 | harmony.hpa = (struct harmony_hpa *)dev->hpa; | 1239 | harmony.hpa = (struct harmony_hpa *)dev->hpa.start; |
1240 | harmony.dev = dev; | 1240 | harmony.dev = dev; |
1241 | 1241 | ||
1242 | /* Grab the ID and revision from the device */ | 1242 | /* Grab the ID and revision from the device */ |
@@ -1250,7 +1250,7 @@ harmony_driver_probe(struct parisc_device *dev) | |||
1250 | 1250 | ||
1251 | printk(KERN_INFO "Lasi Harmony Audio driver " HARMONY_VERSION ", " | 1251 | printk(KERN_INFO "Lasi Harmony Audio driver " HARMONY_VERSION ", " |
1252 | "h/w id %i, rev. %i at 0x%lx, IRQ %i\n", | 1252 | "h/w id %i, rev. %i at 0x%lx, IRQ %i\n", |
1253 | id, rev, dev->hpa, harmony.dev->irq); | 1253 | id, rev, dev->hpa.start, harmony.dev->irq); |
1254 | 1254 | ||
1255 | /* Make sure the control bit isn't set, although I don't think it | 1255 | /* Make sure the control bit isn't set, although I don't think it |
1256 | ever is. */ | 1256 | ever is. */ |