Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 46d42af4501afb9cde30ae4109ccb32cff7b08c4..0a0580f2413d2386c79942bc51a16022e6369960 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2749,8 +2749,7 @@ config OLPC
 
 config OLPC_XO1_PM
        bool "OLPC XO-1 Power Management"
 
 config OLPC_XO1_PM
        bool "OLPC XO-1 Power Management"

-       depends on OLPC && MFD_CS5535 && PM_SLEEP
-       select MFD_CORE
+       depends on OLPC && MFD_CS5535=y && PM_SLEEP

        ---help---
          Add support for poweroff and suspend of the OLPC XO-1 laptop.
 
        ---help---
          Add support for poweroff and suspend of the OLPC XO-1 laptop.