From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

Make Emulex lpfc driver legacy I/O port free.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Cc: James Smart <james.smart@emulex.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/lpfc/lpfc_init.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/scsi/lpfc/lpfc_init.c~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~pci-legacy-i-o-port-free-driver-make-emulex-lpfc-driver-legacy-i-o-port-free	2006-03-24 01:36:39.000000000 -0800
+++ devel-akpm/drivers/scsi/lpfc/lpfc_init.c	2006-03-24 01:36:39.000000000 -0800
@@ -1434,8 +1434,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;
_