diff --git a/[refs] b/[refs] index 6bb36bf34aa5..6bde291bfb38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72ee6ebbb3fe1ac23d1a669b177b858d2028bf09 +refs/heads/master: 07ef83ae9e99377f38f4d0e472ba6ff09324e5e9 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index ae37a7504b57..9727dd59f54c 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -1884,7 +1884,6 @@ source "drivers/mca/Kconfig" config SCx200 tristate "NatSemi SCx200 support" - depends on !X86_VOYAGER help This provides basic support for National Semiconductor's (now AMD's) Geode processors. The driver probes for the