diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 03:32:01 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 03:32:01 +0200 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/scsi/zalon.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-5615ca7906aefbdc3318604c89db5931d0a25910.tar.xz linux-5615ca7906aefbdc3318604c89db5931d0a25910.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/zalon.c')
| -rw-r--r-- | drivers/scsi/zalon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c index 5a51051e31f0..b131432c677d 100644 --- a/drivers/scsi/zalon.c +++ b/drivers/scsi/zalon.c @@ -88,7 +88,7 @@ zalon_probe(struct parisc_device *dev) struct gsc_irq gsc_irq; u32 zalon_vers; int error = -ENODEV; - void __iomem *zalon = ioremap(dev->hpa, 4096); + void __iomem *zalon = ioremap(dev->hpa.start, 4096); void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET; static int unit = 0; struct Scsi_Host *host; @@ -127,7 +127,7 @@ zalon_probe(struct parisc_device *dev) device.chip = zalon720_chip; device.host_id = 7; device.dev = &dev->dev; - device.slot.base = dev->hpa + GSC_SCSI_ZALON_OFFSET; + device.slot.base = dev->hpa.start + GSC_SCSI_ZALON_OFFSET; device.slot.base_v = io_port; device.slot.irq = dev->irq; device.differential = 2; |