projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cdb820
)
[PARISC] OSS: Fix build of parisc harmony driver
author
Stuart Brady
<sdb@parisc-linux.org>
Wed, 11 Jan 2006 01:47:58 +0000
(20:47 -0500)
committer
Kyle McMartin
<kyle@duet.int.mcmartin.ca>
Wed, 11 Jan 2006 02:52:19 +0000
(21:52 -0500)
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>
sound/oss/harmony.c
patch
|
blob
|
blame
|
history
diff --git
a/sound/oss/harmony.c
b/sound/oss/harmony.c
index bee9d344cd2652ce9f29b3145564b6d4d6f27e66..591683c55f2778f503429d13bbdd1c16ba814a88 100644
(file)
--- 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. */