Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit abb4ae4630633573862934173e5f506771c5d6b1

Authored by Ralf Baechle
1 parent a02eb8da02
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[MIPS] PCI: Always enable CONFIG_PCI_DOMAINS 

The cost is just too low.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Showing 2 changed files with 1 additions and 7 deletions Side-by-side Diff

... ... @@ -381,7 +381,6 @@
381 381 select SYS_HAS_EARLY_PRINTK
382 382 select HW_HAS_PCI
383 383 select NR_CPUS_DEFAULT_64
384   - select PCI_DOMAINS
385 384 select SYS_HAS_CPU_R10000
386 385 select SYS_SUPPORTS_64BIT_KERNEL
387 386 select SYS_SUPPORTS_BIG_ENDIAN
... ... @@ -513,7 +512,6 @@
513 512 select BOOT_ELF32
514 513 select DMA_COHERENT
515 514 select NR_CPUS_DEFAULT_4
516   - select PCI_DOMAINS
517 515 select SIBYTE_BCM1x80
518 516 select SWAP_IO_SPACE
519 517 select SYS_HAS_CPU_SB1
... ... @@ -1808,6 +1806,7 @@
1808 1806 config PCI
1809 1807 bool "Support for PCI controller"
1810 1808 depends on HW_HAS_PCI
  1809 + select PCI_DOMAINS
1811 1810 help
1812 1811 Find out whether you have a PCI motherboard. PCI is the name of a
1813 1812 bus system, i.e. the way the CPU talks to the other stuff inside
... ... @@ -1821,7 +1820,6 @@
1821 1820  
1822 1821 config PCI_DOMAINS
1823 1822 bool
1824   - depends on PCI
1825 1823  
1826 1824 source "drivers/pci/Kconfig"
1827 1825  
include/asm-mips/pci.h
Diff comments   View file @ abb4ae4
... ... @@ -150,8 +150,6 @@
150 150 return root;
151 151 }
152 152  
153   -#ifdef CONFIG_PCI_DOMAINS
154   -
155 153 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
156 154  
157 155 static inline int pci_proc_domain(struct pci_bus *bus)
... ... @@ -159,8 +157,6 @@
159 157 struct pci_controller *hose = bus->sysdata;
160 158 return hose->need_domain_info;
161 159 }
162   -
163   -#endif /* CONFIG_PCI_DOMAINS */
164 160  
165 161 #endif /* __KERNEL__ */
166 162