diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c8cb800b4b61..1805b24ba1a2 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -232,7 +232,7 @@ config SMP | |||
232 | 232 | ||
233 | config X86_FIND_SMP_CONFIG | 233 | config X86_FIND_SMP_CONFIG |
234 | def_bool y | 234 | def_bool y |
235 | depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS | 235 | depends on X86_MPPARSE || X86_VOYAGER |
236 | 236 | ||
237 | if ACPI | 237 | if ACPI |
238 | config X86_MPPARSE | 238 | config X86_MPPARSE |
@@ -281,18 +281,6 @@ config X86_VOYAGER | |||
281 | If you do not specifically know you have a Voyager based machine, | 281 | If you do not specifically know you have a Voyager based machine, |
282 | say N here, otherwise the kernel you build will not be bootable. | 282 | say N here, otherwise the kernel you build will not be bootable. |
283 | 283 | ||
284 | config X86_VISWS | ||
285 | bool "SGI 320/540 (Visual Workstation)" | ||
286 | depends on X86_32 && PCI | ||
287 | help | ||
288 | The SGI Visual Workstation series is an IA32-based workstation | ||
289 | based on SGI systems chips with some legacy PC hardware attached. | ||
290 | |||
291 | Say Y here to create a kernel to run on the SGI 320 or 540. | ||
292 | |||
293 | A kernel compiled for the Visual Workstation will not run on PCs | ||
294 | and vice versa. See <file:Documentation/sgi-visws.txt> for details. | ||
295 | |||
296 | config X86_GENERICARCH | 284 | config X86_GENERICARCH |
297 | bool "Generic architecture" | 285 | bool "Generic architecture" |
298 | depends on X86_32 | 286 | depends on X86_32 |
@@ -363,6 +351,18 @@ config X86_VSMP | |||
363 | 351 | ||
364 | endchoice | 352 | endchoice |
365 | 353 | ||
354 | config X86_VISWS | ||
355 | bool "SGI 320/540 (Visual Workstation)" | ||
356 | depends on X86_32 && PCI | ||
357 | help | ||
358 | The SGI Visual Workstation series is an IA32-based workstation | ||
359 | based on SGI systems chips with some legacy PC hardware attached. | ||
360 | |||
361 | Say Y here to create a kernel to run on the SGI 320 or 540. | ||
362 | |||
363 | A kernel compiled for the Visual Workstation will run on general | ||
364 | PCs as well. See <file:Documentation/sgi-visws.txt> for details. | ||
365 | |||
366 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 366 | config SCHED_NO_NO_OMIT_FRAME_POINTER |
367 | def_bool y | 367 | def_bool y |
368 | prompt "Single-depth WCHAN output" | 368 | prompt "Single-depth WCHAN output" |