forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: untangle pci dependencies

Browse source 
make PCI-less subarches not build with PCI - instead of complicating
the PCI dependencies.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar 2008-05-19 14:10:14 +02:00 • committed by Thomas Gleixner
parent c9fea78dc9
commit 1ac9701816
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/Kconfig
View file

@ -258,7 +258,7 @@ config X86_ELAN
config X86_VOYAGER config X86_VOYAGER
bool "Voyager (NCR)" bool "Voyager (NCR)"
depends on X86_32 && (SMP || BROKEN) depends on X86_32 && (SMP || BROKEN) && !PCI
help help
Voyager is an MCA-based 32-way capable SMP architecture proprietary Voyager is an MCA-based 32-way capable SMP architecture proprietary
to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
@ -300,7 +300,7 @@ config X86_BIGSMP
config X86_VISWS config X86_VISWS
bool "SGI 320/540 (Visual Workstation)" bool "SGI 320/540 (Visual Workstation)"
depends on X86_32 depends on X86_32 && !PCI
help help
The SGI Visual Workstation series is an IA32-based workstation The SGI Visual Workstation series is an IA32-based workstation
based on SGI systems chips with some legacy PC hardware attached. based on SGI systems chips with some legacy PC hardware attached.
@ -344,7 +344,7 @@ config X86_RDC321X
config X86_VSMP config X86_VSMP
bool "Support for ScaleMP vSMP" bool "Support for ScaleMP vSMP"
select PARAVIRT select PARAVIRT
depends on X86_64 depends on X86_64 && !PCI
help help
Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
supposed to run on these EM64T-based machines. Only choose this option supposed to run on these EM64T-based machines. Only choose this option
@ -1477,8 +1477,7 @@ endmenu
menu "Bus options (PCI etc.)" menu "Bus options (PCI etc.)"
config PCI config PCI
bool "PCI support" if !X86_VISWS && !X86_VSMP bool "PCI support"
depends on !X86_VOYAGER
default y default y
select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
help help