Commit 1ac97018 authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

x86: untangle pci dependencies 



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

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c9fea78d

arch/x86/Kconfig

+4 −5
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ config X86_ELAN 


config X86_VOYAGER

	bool "Voyager (NCR)"

	depends on X86_32 && (SMP || BROKEN)

	depends on X86_32 && (SMP || BROKEN) && !PCI

	help

	  Voyager is an MCA-based 32-way capable SMP architecture proprietary

	  to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -300,7 +300,7 @@ config X86_BIGSMP 


config X86_VISWS

	bool "SGI 320/540 (Visual Workstation)"

	depends on X86_32

	depends on X86_32 && !PCI

	help

	  The SGI Visual Workstation series is an IA32-based workstation

	  based on SGI systems chips with some legacy PC hardware attached.
@@ -344,7 +344,7 @@ config X86_RDC321X 
config X86_VSMP

	bool "Support for ScaleMP vSMP"

	select PARAVIRT

	depends on X86_64

	depends on X86_64 && !PCI

	help

	  Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is

	  supposed to run on these EM64T-based machines.  Only choose this option
@@ -1477,8 +1477,7 @@ endmenu 
menu "Bus options (PCI etc.)"



config PCI

	bool "PCI support" if !X86_VISWS && !X86_VSMP

	depends on !X86_VOYAGER

	bool "PCI support"

	default y

	select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)

	help