diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/pci-bridge.h | 5 | ||||
-rw-r--r-- | include/asm-powerpc/pci.h | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index 2972f0d3afaa..fed8f52071f1 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h | |||
@@ -30,6 +30,11 @@ enum { | |||
30 | * ISA forwarding enabled | 30 | * ISA forwarding enabled |
31 | */ | 31 | */ |
32 | PPC_PCI_CAN_SKIP_ISA_ALIGN = 0x00000008, | 32 | PPC_PCI_CAN_SKIP_ISA_ALIGN = 0x00000008, |
33 | |||
34 | /* Enable domain numbers in /proc */ | ||
35 | PPC_PCI_ENABLE_PROC_DOMAINS = 0x00000010, | ||
36 | /* ... except for domain 0 */ | ||
37 | PPC_PCI_COMPAT_DOMAIN_0 = 0x00000020, | ||
33 | }; | 38 | }; |
34 | 39 | ||
35 | 40 | ||
diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h index 47cc117a1422..2883f566709d 100644 --- a/include/asm-powerpc/pci.h +++ b/include/asm-powerpc/pci.h | |||
@@ -98,9 +98,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
98 | #define get_pci_dma_ops() NULL | 98 | #define get_pci_dma_ops() NULL |
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | /* Decide whether to display the domain number in /proc */ | ||
102 | extern int pci_proc_domain(struct pci_bus *bus); | ||
103 | |||
104 | #else /* 32-bit */ | 101 | #else /* 32-bit */ |
105 | 102 | ||
106 | #ifdef CONFIG_PCI | 103 | #ifdef CONFIG_PCI |
@@ -112,17 +109,14 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
112 | *strategy_parameter = ~0UL; | 109 | *strategy_parameter = ~0UL; |
113 | } | 110 | } |
114 | #endif | 111 | #endif |
115 | |||
116 | /* Set the name of the bus as it appears in /proc/bus/pci */ | ||
117 | static inline int pci_proc_domain(struct pci_bus *bus) | ||
118 | { | ||
119 | return 0; | ||
120 | } | ||
121 | |||
122 | #endif /* CONFIG_PPC64 */ | 112 | #endif /* CONFIG_PPC64 */ |
123 | 113 | ||
124 | extern int pci_domain_nr(struct pci_bus *bus); | 114 | extern int pci_domain_nr(struct pci_bus *bus); |
125 | 115 | ||
116 | /* Decide whether to display the domain number in /proc */ | ||
117 | extern int pci_proc_domain(struct pci_bus *bus); | ||
118 | |||
119 | |||
126 | struct vm_area_struct; | 120 | struct vm_area_struct; |
127 | /* Map a range of PCI memory or I/O space for a device into user space */ | 121 | /* Map a range of PCI memory or I/O space for a device into user space */ |
128 | int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, | 122 | int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, |