diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 18:17:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 18:17:11 +0100 |
| commit | d7197a5ad8528642cb70f1d27d4d5c7332a2b395 (patch) | |
| tree | dfaa26ab107c32d4a82deb4a060e310499fdafb9 /arch/x86/Kconfig | |
| parent | f682a7920baf7b721d01dd317f3b532265357cbb (diff) | |
| parent | fa112cf1e8bc693d5a666b1c479a2859c8b6e0f1 (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"Two minor OLPC changes: a build fix and a new quirk"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
x86/olpc: Indicate that legacy PC XO-1 platform should not register RTC
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 46d42af4501a..0a0580f2413d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2749,8 +2749,7 @@ config OLPC 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. |