diff --git a/[refs] b/[refs] index 1b8ed3c6b402..06fc8bef0830 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b9f4f49e2abe787673de8f1f56f053fb30fec24 +refs/heads/master: a6784ad7eafa74a085c8458909eda0699a8fcf57 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index c70d8867800f..3b1b1da78dae 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -283,7 +283,7 @@ config X86_VOYAGER config X86_VISWS bool "SGI 320/540 (Visual Workstation)" - depends on X86_32 && !PCI + depends on X86_32 && PCI help The SGI Visual Workstation series is an IA32-based workstation based on SGI systems chips with some legacy PC hardware attached. @@ -355,7 +355,7 @@ config X86_RDC321X config X86_VSMP bool "Support for ScaleMP vSMP" select PARAVIRT - depends on X86_64 && !PCI + depends on X86_64 && PCI 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