Signed-off-by: Andrew Morton --- drivers/scsi/lpfc/lpfc_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/scsi/lpfc/lpfc_init.c~gregkh-pci-pci-legacy-i-o-port-free-driver-make-emulex-lpfc-driver-legacy-i-o-port-free drivers/scsi/lpfc/lpfc_init.c --- devel/drivers/scsi/lpfc/lpfc_init.c~gregkh-pci-pci-legacy-i-o-port-free-driver-make-emulex-lpfc-driver-legacy-i-o-port-free 2006-05-27 23:28:29.000000000 -0700 +++ devel-akpm/drivers/scsi/lpfc/lpfc_init.c 2006-05-27 23:28:29.000000000 -0700 @@ -1425,8 +1425,9 @@ lpfc_pci_probe_one(struct pci_dev *pdev, int error = -ENODEV, retval; int i; uint16_t iotag; + int bars = pci_select_bars(pdev, IORESOURCE_MEM); - if (pci_enable_device(pdev)) + if (pci_enable_device_bars(pdev, bars)) goto out; if (pci_request_regions(pdev, LPFC_DRIVER_NAME)) goto out_disable_device; _