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/platform | |
| 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/platform')
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo1-rtc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo1-rtc.c b/arch/x86/platform/olpc/olpc-xo1-rtc.c index a2b4efddd61a..8e7ddd7e313a 100644 --- a/arch/x86/platform/olpc/olpc-xo1-rtc.c +++ b/arch/x86/platform/olpc/olpc-xo1-rtc.c @@ -16,6 +16,7 @@ #include <asm/msr.h> #include <asm/olpc.h> +#include <asm/x86_init.h> static void rtc_wake_on(struct device *dev) { @@ -75,6 +76,8 @@ static int __init xo1_rtc_init(void) if (r) return r; + x86_platform.legacy.rtc = 0; + device_init_wakeup(&xo1_rtc_device.dev, 1); return 0; } |