summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-02-23 22:29:23 +0100
committerBjorn Helgaas <bhelgaas@google.com>2012-02-24 04:18:55 +0100
commit47087700ce3ccb2bf69f4dcb6ad7f59764e51308 (patch)
treea5c59cb190882dfc72026c32308c22aaa5344d05
parentx86/mrst/pci: avoid SoC fixups on non-SoC platforms (diff)
downloadlinux-47087700ce3ccb2bf69f4dcb6ad7f59764e51308.tar.xz
linux-47087700ce3ccb2bf69f4dcb6ad7f59764e51308.zip
PCI: make pci_flags always available
If we move resource assignment functions into the core, we'll still need a way for architectures to prevent reassignment, e.g., the "pci_probe_only" functionality, and we'll need a generic, always available way the core can test for that. The "pci_flags" arrangement used by several architectures seems like a convenient way to do this. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/setup-bus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 2991a8975064..6db307fa20f5 100644
--- 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 __weak pci_flags;
+
struct pci_dev_resource {
struct list_head list;
struct resource *res;