diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2008-02-29 05:09:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-06-16 13:20:06 -0700 |
| commit | dbeda1b14c51a1490d43975e506252cbe4964e21 (patch) | |
| tree | 2f352528be9b901934f8f1cf6ec01dffff5d2d3e /arch | |
| parent | 69f24455cf25d776f8b19d06c7a43a8185fc633d (diff) | |
x86: fix recursive dependencies
commit 823c248e7cc75b4f22da914b01f8e5433cff197e in mainline
The proper dependency check uncovered a few dependency problems,
the subarchitecture used a mixture of selects and depends on SMP
and PCI dependency was messed up.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 405689cf8d74..6342a0735254 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -246,8 +246,7 @@ config X86_ELAN config X86_VOYAGER bool "Voyager (NCR)" - depends on X86_32 - select SMP if !BROKEN + depends on X86_32 && (SMP || BROKEN) help Voyager is an MCA-based 32-way capable SMP architecture proprietary to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. @@ -259,9 +258,8 @@ config X86_VOYAGER config X86_NUMAQ bool "NUMAQ (IBM/Sequent)" - select SMP + depends on SMP && X86_32 select NUMA - depends on X86_32 help This option is used for getting Linux to run on a (IBM/Sequent) NUMA multiquad box. This changes the way that processors are bootstrapped, @@ -332,7 +330,7 @@ config X86_RDC321X config X86_VSMP bool "Support for ScaleMP vSMP" - depends on X86_64 && PCI + depends on X86_64 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 @@ -1384,7 +1382,7 @@ endmenu menu "Bus options (PCI etc.)" config PCI - bool "PCI support" if !X86_VISWS + bool "PCI support" if !X86_VISWS && !X86_VSMP depends on !X86_VOYAGER default y select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |