summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pci2000.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
commit9f9f3e6e8548a596697778337110a423c384b6f3 (patch)
tree5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /drivers/scsi/pci2000.c
parentd5c9a365ee7d2fded249aa5abfc5e89587583029 (diff)
Merge with Linux 2.3.49.
Diffstat (limited to 'drivers/scsi/pci2000.c')
-rw-r--r--drivers/scsi/pci2000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pci2000.c b/drivers/scsi/pci2000.c
index 6aef8ae63..7f14fc61b 100644
--- a/drivers/scsi/pci2000.c
+++ b/drivers/scsi/pci2000.c
@@ -660,7 +660,7 @@ int Pci2000_Detect (Scsi_Host_Template *tpnt)
padapter = HOSTDATA(pshost);
#if LINUX_VERSION_CODE > LINUXVERSION(2,1,92)
- padapter->basePort = pdev->base_address[1] & 0xFFFE;
+ padapter->basePort = pci_resource_start (pdev, 1);
#else
pcibios_read_config_word (pci_bus, pci_device_fn, PCI_BASE_ADDRESS_1, &padapter->basePort);
padapter->basePort &= 0xFFFE;