summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-10-11 23:46:03 +0100
committerRalf Baechle <ralf@linux-mips.org>2007-10-11 23:46:03 +0100
commitabb4ae4630633573862934173e5f506771c5d6b1 (patch)
treea6051f682e2a7f3a6b907767286e504b0e9404a5
parenta02eb8da02741f43efb6f06adf534f9f2b913d80 (diff)
downloadop-kernel-dev-abb4ae4630633573862934173e5f506771c5d6b1.zip
op-kernel-dev-abb4ae4630633573862934173e5f506771c5d6b1.tar.gz
[MIPS] PCI: Always enable CONFIG_PCI_DOMAINS
The cost is just too low. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-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 6648f9b..ebc7b4b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -381,7 +381,6 @@ config SGI_IP27
select SYS_HAS_EARLY_PRINTK
select HW_HAS_PCI
select NR_CPUS_DEFAULT_64
- select PCI_DOMAINS
select SYS_HAS_CPU_R10000
select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_BIG_ENDIAN
@@ -513,7 +512,6 @@ config SIBYTE_BIGSUR
select BOOT_ELF32
select DMA_COHERENT
select NR_CPUS_DEFAULT_4
- select PCI_DOMAINS
select SIBYTE_BCM1x80
select SWAP_IO_SPACE
select SYS_HAS_CPU_SB1
@@ -1808,6 +1806,7 @@ config HW_HAS_PCI
config PCI
bool "Support for PCI controller"
depends on HW_HAS_PCI
+ select PCI_DOMAINS
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
@@ -1821,7 +1820,6 @@ config PCI
config PCI_DOMAINS
bool
- depends on PCI
source "drivers/pci/Kconfig"
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 4fcc185..301ff2f 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)
return root;
}
-#ifdef CONFIG_PCI_DOMAINS
-
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
static inline int pci_proc_domain(struct pci_bus *bus)
@@ -160,8 +158,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
return hose->need_domain_info;
}
-#endif /* CONFIG_PCI_DOMAINS */
-
#endif /* __KERNEL__ */
/* implement the pci_ DMA API in terms of the generic device dma_ one */
OpenPOWER on IntegriCloud