From 6ef05b958a308f9268599198736af349a37cb942 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 10 Jul 2008 19:37:44 +0200 Subject: [PATCH] --- yaml --- r: 100157 b: refs/heads/master c: b6770c83b4b88dd832cc77916b1935b0311c64e0 h: refs/heads/master i: 100155: 621c510d64c0211c29113982914c880d6be89903 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d6da476e3f9f..fe6cbb391faa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a55a00aad9f5c4e9bb97729b42a7ceea2a3b6fb +refs/heads/master: b6770c83b4b88dd832cc77916b1935b0311c64e0 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 24ff43a2ca56..1765714176d4 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -353,7 +353,7 @@ endchoice config X86_VISWS bool "SGI 320/540 (Visual Workstation)" - depends on X86_32 && PCI + depends on X86_32 && PCI && !X86_VOYAGER help The SGI Visual Workstation series is an IA32-based workstation based on SGI systems chips with some legacy PC hardware attached.