diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:57 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:57 -0500 |
commit | 2909060699226f70d731d9c242489418f7da4972 (patch) | |
tree | 8d1cd71073d18ac72e47523fc36c69cacf29d13d /arch/mips/include/asm/pci.h | |
parent | e5b3684181ed91afa05e610af1c8328b7cd7871b (diff) |
mips/PCI: replace pci_probe_only with pci_flags
Some architectures (alpha, mips, powerpc) have an arch-specific
"pci_probe_only" flag. Others use PCI_PROBE_ONLY in pci_flags for
the same purpose. This moves mips to the pci_flags approach so
generic code can use the same test across all architectures.
CC: Ralf Baechle <ralf@linux-mips.org>
CC: linux-mips@linux-mips.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/mips/include/asm/pci.h')
-rw-r--r-- | arch/mips/include/asm/pci.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 576397c69920..1e4fa3da3f70 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
@@ -92,6 +92,7 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
92 | #include <asm/scatterlist.h> | 92 | #include <asm/scatterlist.h> |
93 | #include <linux/string.h> | 93 | #include <linux/string.h> |
94 | #include <asm/io.h> | 94 | #include <asm/io.h> |
95 | #include <asm-generic/pci-bridge.h> | ||
95 | 96 | ||
96 | struct pci_dev; | 97 | struct pci_dev; |
97 | 98 | ||
@@ -145,8 +146,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | |||
145 | #define arch_setup_msi_irqs arch_setup_msi_irqs | 146 | #define arch_setup_msi_irqs arch_setup_msi_irqs |
146 | #endif | 147 | #endif |
147 | 148 | ||
148 | extern int pci_probe_only; | ||
149 | |||
150 | extern char * (*pcibios_plat_setup)(char *str); | 149 | extern char * (*pcibios_plat_setup)(char *str); |
151 | 150 | ||
152 | #endif /* _ASM_PCI_H */ | 151 | #endif /* _ASM_PCI_H */ |