diff --git a/[refs] b/[refs] index d616f519002e..7c2137b735b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b04fa014c11e6415da8b5a7999dbd201abad53c +refs/heads/master: e26a28d190304d910ee49b81cbfe6d9241f56e86 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index c3f880902d66..845ea2b2d487 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER config OLPC bool "One Laptop Per Child support" + depends on MGEODE_LX default n help Add support for detecting the unique features of the OLPC