diff options
| author | Matthew Wilcox <willy@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
| commit | 53f01bba49938f115237fe43a261c31ac13ae5c6 (patch) | |
| tree | df2a5fa9d95c7e69447ac0c89d6e149888c9bd1c /sound | |
| parent | bdad1f836ab1ca2b18a625222f63f630cfd14e41 (diff) | |
| download | linux-53f01bba49938f115237fe43a261c31ac13ae5c6.tar.gz | |
[PARISC] Convert parisc_device to use struct resource for hpa
Convert pa_dev->hpa from an unsigned long to a struct resource. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Fix up users of ->hpa to use ->hpa.start instead. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/parisc/harmony.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index f560dd8cdb90..8b3ea26469ad 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c @@ -852,14 +852,14 @@ snd_harmony_create(snd_card_t *card, memset(&h->pbuf, 0, sizeof(h->pbuf)); memset(&h->cbuf, 0, sizeof(h->cbuf)); - h->hpa = padev->hpa; + h->hpa = padev->hpa.start; h->card = card; h->dev = padev; h->irq = padev->irq; - h->iobase = ioremap_nocache(padev->hpa, HARMONY_SIZE); + h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE); if (h->iobase == NULL) { printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n", - padev->hpa); + padev->hpa.start); err = -EBUSY; goto free_and_ret; } |