git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86/rtc, mrst: Don't register a platform RTC device for for Intel MID platforms
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
rtc.c
diff --git
a/arch/x86/kernel/rtc.c
b/arch/x86/kernel/rtc.c
index
348ce01
..
af6db6e
100644
(file)
--- a/
arch/x86/kernel/rtc.c
+++ b/
arch/x86/kernel/rtc.c
@@
-12,6
+12,7
@@
#include <asm/vsyscall.h>
#include <asm/x86_init.h>
#include <asm/time.h>
#include <asm/vsyscall.h>
#include <asm/x86_init.h>
#include <asm/time.h>
+#include <asm/mrst.h>
#ifdef CONFIG_X86_32
/*
#ifdef CONFIG_X86_32
/*
@@
-242,6
+243,10
@@
static __init int add_rtc_cmos(void)
if (of_have_populated_dt())
return 0;
if (of_have_populated_dt())
return 0;
+ /* Intel MID platforms don't have ioport rtc */
+ if (mrst_identify_cpu())
+ return -ENODEV;
+
platform_device_register(&rtc_device);
dev_info(&rtc_device.dev,
"registered platform RTC device (no PNP device found)\n");
platform_device_register(&rtc_device);
dev_info(&rtc_device.dev,
"registered platform RTC device (no PNP device found)\n");