diff options
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/pci-bridge.h | 5 | ||||
-rw-r--r-- | arch/powerpc/include/asm/pci.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 4c61fa0b8d75..3faf575f6b06 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h | |||
@@ -284,11 +284,6 @@ static inline int isa_vaddr_is_ioport(void __iomem *address) | |||
284 | extern int pcibios_unmap_io_space(struct pci_bus *bus); | 284 | extern int pcibios_unmap_io_space(struct pci_bus *bus); |
285 | extern int pcibios_map_io_space(struct pci_bus *bus); | 285 | extern int pcibios_map_io_space(struct pci_bus *bus); |
286 | 286 | ||
287 | /* Return values for ppc_md.pci_probe_mode function */ | ||
288 | #define PCI_PROBE_NONE -1 /* Don't look at this bus at all */ | ||
289 | #define PCI_PROBE_NORMAL 0 /* Do normal PCI probing */ | ||
290 | #define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */ | ||
291 | |||
292 | #ifdef CONFIG_NUMA | 287 | #ifdef CONFIG_NUMA |
293 | #define PHB_SET_NODE(PHB, NODE) ((PHB)->node = (NODE)) | 288 | #define PHB_SET_NODE(PHB, NODE) ((PHB)->node = (NODE)) |
294 | #else | 289 | #else |
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 7ae46d7e270d..b856a837b4a3 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h | |||
@@ -22,6 +22,11 @@ | |||
22 | 22 | ||
23 | #include <asm-generic/pci-dma-compat.h> | 23 | #include <asm-generic/pci-dma-compat.h> |
24 | 24 | ||
25 | /* Return values for ppc_md.pci_probe_mode function */ | ||
26 | #define PCI_PROBE_NONE -1 /* Don't look at this bus at all */ | ||
27 | #define PCI_PROBE_NORMAL 0 /* Do normal PCI probing */ | ||
28 | #define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */ | ||
29 | |||
25 | #define PCIBIOS_MIN_IO 0x1000 | 30 | #define PCIBIOS_MIN_IO 0x1000 |
26 | #define PCIBIOS_MIN_MEM 0x10000000 | 31 | #define PCIBIOS_MIN_MEM 0x10000000 |
27 | 32 | ||