aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2008-02-28 23:09:02 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:51 -0400
commit823c248e7cc75b4f22da914b01f8e5433cff197e (patch)
treee03abcf023961d183fd2f314a9800a568acdcd5e /arch/x86
parent81e103f1f1bb0d35000f0e99626bf7abf864b486 (diff)
x86: fix recursive dependencies
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 810248f01729..dbdd3142215c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -241,8 +241,7 @@ config X86_ELAN
241 241
242config X86_VOYAGER 242config X86_VOYAGER
243 bool "Voyager (NCR)" 243 bool "Voyager (NCR)"
244 depends on X86_32 244 depends on X86_32 && (SMP || BROKEN)
245 select SMP if !BROKEN
246 help 245 help
247 Voyager is an MCA-based 32-way capable SMP architecture proprietary 246 Voyager is an MCA-based 32-way capable SMP architecture proprietary
248 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. 247 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -254,9 +253,8 @@ config X86_VOYAGER
254 253
255config X86_NUMAQ 254config X86_NUMAQ
256 bool "NUMAQ (IBM/Sequent)" 255 bool "NUMAQ (IBM/Sequent)"
257 select SMP 256 depends on SMP && X86_32
258 select NUMA 257 select NUMA
259 depends on X86_32
260 help 258 help
261 This option is used for getting Linux to run on a (IBM/Sequent) NUMA 259 This option is used for getting Linux to run on a (IBM/Sequent) NUMA
262 multiquad box. This changes the way that processors are bootstrapped, 260 multiquad box. This changes the way that processors are bootstrapped,
@@ -327,8 +325,8 @@ config X86_RDC321X
327 325
328config X86_VSMP 326config X86_VSMP
329 bool "Support for ScaleMP vSMP" 327 bool "Support for ScaleMP vSMP"
330 depends on X86_64 && PCI
331 select PARAVIRT 328 select PARAVIRT
329 depends on X86_64
332 help 330 help
333 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is 331 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
334 supposed to run on these EM64T-based machines. Only choose this option 332 supposed to run on these EM64T-based machines. Only choose this option
@@ -1380,7 +1378,7 @@ endmenu
1380menu "Bus options (PCI etc.)" 1378menu "Bus options (PCI etc.)"
1381 1379
1382config PCI 1380config PCI
1383 bool "PCI support" if !X86_VISWS 1381 bool "PCI support" if !X86_VISWS && !X86_VSMP
1384 depends on !X86_VOYAGER 1382 depends on !X86_VOYAGER
1385 default y 1383 default y
1386 select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) 1384 select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)