Merge branch 'topic/stratus' into next

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 9e31c0ab650e..8f169002dc7e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
+#include <asm-generic/pci-bridge.h>
 #include <asm/setup.h>
 #include "pci.h"
 
@@ -3900,6 +3901,8 @@ static int __init pci_setup(char *str)
                                 pcie_bus_config = PCIE_BUS_PERFORMANCE;
                         } else if (!strncmp(str, "pcie_bus_peer2peer", 18)) {
                                 pcie_bus_config = PCIE_BUS_PEER2PEER;
+                        } else if (!strncmp(str, "pcie_scan_all", 13)) {
+                                pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS);
                         } else {
                                 printk(KERN_ERR "PCI: Unknown option `%s'\n",
                                                 str);