Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next

2012-02-24 14:25:33 -08:00
parent b07f2ebc10 fb127cb9de
commit ecd58d667a
72 changed files with 397 additions and 1120 deletions
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -25,8 +25,11 @@
 #include <linux/ioport.h>
 #include <linux/cache.h>
 #include <linux/slab.h>
+#include <asm-generic/pci-bridge.h>
 #include "pci.h"

+unsigned int pci_flags;
+
 struct pci_dev_resource {
 	struct list_head list;
 	struct resource *res;