aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/Kconfig4
-rw-r--r--include/asm-mips/pci.h4
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6648f9b914e7..ebc7b4b45c84 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -381,7 +381,6 @@ config SGI_IP27
381 select SYS_HAS_EARLY_PRINTK 381 select SYS_HAS_EARLY_PRINTK
382 select HW_HAS_PCI 382 select HW_HAS_PCI
383 select NR_CPUS_DEFAULT_64 383 select NR_CPUS_DEFAULT_64
384 select PCI_DOMAINS
385 select SYS_HAS_CPU_R10000 384 select SYS_HAS_CPU_R10000
386 select SYS_SUPPORTS_64BIT_KERNEL 385 select SYS_SUPPORTS_64BIT_KERNEL
387 select SYS_SUPPORTS_BIG_ENDIAN 386 select SYS_SUPPORTS_BIG_ENDIAN
@@ -513,7 +512,6 @@ config SIBYTE_BIGSUR
513 select BOOT_ELF32 512 select BOOT_ELF32
514 select DMA_COHERENT 513 select DMA_COHERENT
515 select NR_CPUS_DEFAULT_4 514 select NR_CPUS_DEFAULT_4
516 select PCI_DOMAINS
517 select SIBYTE_BCM1x80 515 select SIBYTE_BCM1x80
518 select SWAP_IO_SPACE 516 select SWAP_IO_SPACE
519 select SYS_HAS_CPU_SB1 517 select SYS_HAS_CPU_SB1
@@ -1808,6 +1806,7 @@ config HW_HAS_PCI
1808config PCI 1806config PCI
1809 bool "Support for PCI controller" 1807 bool "Support for PCI controller"
1810 depends on HW_HAS_PCI 1808 depends on HW_HAS_PCI
1809 select PCI_DOMAINS
1811 help 1810 help
1812 Find out whether you have a PCI motherboard. PCI is the name of a 1811 Find out whether you have a PCI motherboard. PCI is the name of a
1813 bus system, i.e. the way the CPU talks to the other stuff inside 1812 bus system, i.e. the way the CPU talks to the other stuff inside
@@ -1821,7 +1820,6 @@ config PCI
1821 1820
1822config PCI_DOMAINS 1821config PCI_DOMAINS
1823 bool 1822 bool
1824 depends on PCI
1825 1823
1826source "drivers/pci/Kconfig" 1824source "drivers/pci/Kconfig"
1827 1825
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 4fcc185cb2d1..301ff2f28012 100644
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -150,8 +150,6 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res)
150 return root; 150 return root;
151} 151}
152 152
153#ifdef CONFIG_PCI_DOMAINS
154
155#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index 153#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
156 154
157static inline int pci_proc_domain(struct pci_bus *bus) 155static inline int pci_proc_domain(struct pci_bus *bus)
@@ -160,8 +158,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
160 return hose->need_domain_info; 158 return hose->need_domain_info;
161} 159}
162 160
163#endif /* CONFIG_PCI_DOMAINS */
164
165#endif /* __KERNEL__ */ 161#endif /* __KERNEL__ */
166 162
167/* implement the pci_ DMA API in terms of the generic device dma_ one */ 163/* implement the pci_ DMA API in terms of the generic device dma_ one */