lpfc build failure in latest git

CC [M] drivers/scsi/lpfc/lpfc_init.o
drivers/scsi/lpfc/lpfc_init.c: In function ‘lpfc_pci_probe_one’:
drivers/scsi/lpfc/lpfc_init.c:1897: error: implicit declaration of function ‘pci_enable_device_bars’ make[6]: *** [drivers/scsi/lpfc/lpfc_init.o] Error 1

seen on both x86 archs.
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Oh, Greg was supposed to add this if he merged last. I'll send it through the SCSI tree.

James

Subject: git-scsi-misc vs gregkh-pci-pci-remove-users-of-pci_enable_device_bars
From: Andrew Morton <[email protected]>

Whoever merges last needs this.

---

 drivers/scsi/lpfc/lpfc_init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/scsi/lpfc/lpfc_init.c~git-scsi-misc-vs-gregkh-pci-pci-remove-users-of-pci_enable_device_bars drivers/scsi/lpfc/lpfc_init.c
@@ -1894,7 +1894,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev,
 	uint16_t iotag;
 	int bars = pci_select_bars(pdev, IORESOURCE_MEM);
 
-	if (pci_enable_device_bars(pdev, bars))
+	if (pci_enable_device_mem(pdev))
 		goto out;
 	if (pci_request_selected_regions(pdev, bars, LPFC_DRIVER_NAME))
 		goto out_disable_device;

_

-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html