diff options
| author | Mathias Nyman <mathias.nyman@linux.intel.com> | 2011-11-15 14:46:52 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-05 17:09:21 +0100 |
| commit | 35d476996288af6a4aaa8b172bcd31decd233de7 (patch) | |
| tree | 36aecf25db4c224627e4fe1a96c7e2ca44f59602 /arch/x86/include/asm/mrst.h | |
| parent | a7a280493fb63f8e9fbfc8feec5810bf50e1e54f (diff) | |
| download | olio-linux-3.10-35d476996288af6a4aaa8b172bcd31decd233de7.tar.xz olio-linux-3.10-35d476996288af6a4aaa8b172bcd31decd233de7.zip | |
x86/rtc, mrst: Don't register a platform RTC device for for Intel MID platforms
Intel MID x86 platforms have a memory mapped virtual RTC
instead. No MID platform have the default ports (and
accessing them may do weird stuff).
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: feng.tang@intel.com
Cc: Feng Tang <feng.tang@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/mrst.h')
| -rw-r--r-- | arch/x86/include/asm/mrst.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h index e6283129c82..93f79094c22 100644 --- a/arch/x86/include/asm/mrst.h +++ b/arch/x86/include/asm/mrst.h @@ -31,11 +31,20 @@ enum mrst_cpu_type { }; extern enum mrst_cpu_type __mrst_cpu_chip; + +#ifdef CONFIG_X86_INTEL_MID + static inline enum mrst_cpu_type mrst_identify_cpu(void) { return __mrst_cpu_chip; } +#else /* !CONFIG_X86_INTEL_MID */ + +#define mrst_identify_cpu() (0) + +#endif /* !CONFIG_X86_INTEL_MID */ + enum mrst_timer_options { MRST_TIMER_DEFAULT, MRST_TIMER_APBT_ONLY, |