Merge remote-tracking branch 'pci/next'

[karo-tx-linux.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index f14a970b61fa59bf00b6e97474da3ec024ba315e..f53b8e85f137902f6e8b0667ae9f0539c06537a1 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/cpumask.h>
 #include <linux/pci-aspm.h>
 #include <linux/module.h>
 #include <linux/cpumask.h>
 #include <linux/pci-aspm.h>

+#include <linux/aer.h>

 #include <asm-generic/pci-bridge.h>
 #include "pci.h"
 
 #include <asm-generic/pci-bridge.h>
 #include "pci.h"
 


@@ -1597,6 +1598,9 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
 
 static void pci_init_capabilities(struct pci_dev *dev)
 {
 
 static void pci_init_capabilities(struct pci_dev *dev)
 {

+       /* Enhanced Allocation */
+       pci_ea_init(dev);
+

        /* MSI/MSI-X list */
        pci_msi_init_pci_dev(dev);
 
        /* MSI/MSI-X list */
        pci_msi_init_pci_dev(dev);
 


@@ -1620,6 +1624,8 @@ static void pci_init_capabilities(struct pci_dev *dev)
 
        /* Enable ACS P2P upstream forwarding */
        pci_enable_acs(dev);
 
        /* Enable ACS P2P upstream forwarding */
        pci_enable_acs(dev);

+
+       pci_cleanup_aer_error_status_regs(dev);

 }
 
 /*
 }
 
 /*