Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: fix 4x section mismatch warnings
  PCI: fix section mismatch warnings referring to pci_do_scan_bus
  pci: pci_enable_device_bars() fix for lpfc driver
  Revert "PCI: PCIE ASPM support"

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 29b4cf9e059b..6cfeba7454d4 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1894,7 +1894,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         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;