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.