All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH -tip] x86: fix build without CONFIG_X86_MRST
@ 2011-12-06 10:18 Stanislaw Gruszka
  2011-12-06 10:30 ` Alan Cox
  0 siblings, 1 reply; 6+ messages in thread
From: Stanislaw Gruszka @ 2011-12-06 10:18 UTC (permalink / raw)
  To: x86; +Cc: linux-kernel, Stanislaw Gruszka, Mathias Nyman

Fix compilation error when compiled with CONFIG_X86_INTEL_MID and
without CONFIG_X86_MRST:

arch/x86/built-in.o: In function `add_rtc_cmos':
rtc.c:(.init.text+0x34bd): undefined reference to `__mrst_cpu_chip'

Problem was caused currently by:

commit 35d476996288af6a4aaa8b172bcd31decd233de7
Author: Mathias Nyman <mathias.nyman@linux.intel.com>
Date:   Tue Nov 15 14:46:52 2011 -0800

    x86/rtc, mrst: Don't register a platform RTC device for for Intel MID platforms

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 arch/x86/include/asm/mrst.h |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index 93f7909..3f4589b 100644
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/mrst.h
@@ -32,18 +32,14 @@ enum mrst_cpu_type {
 
 extern enum mrst_cpu_type __mrst_cpu_chip;
 
-#ifdef CONFIG_X86_INTEL_MID
-
+#ifdef CONFIG_X86_MRST
 static inline enum mrst_cpu_type mrst_identify_cpu(void)
 {
 	return __mrst_cpu_chip;
 }
-
-#else /* !CONFIG_X86_INTEL_MID */
-
+#else
 #define mrst_identify_cpu()    (0)
-
-#endif /* !CONFIG_X86_INTEL_MID */
+#endif
 
 enum mrst_timer_options {
 	MRST_TIMER_DEFAULT,
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-12-12 18:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-06 10:18 [PATCH -tip] x86: fix build without CONFIG_X86_MRST Stanislaw Gruszka
2011-12-06 10:30 ` Alan Cox
2011-12-06 10:31   ` Ingo Molnar
2011-12-06 13:17     ` Alan Cox
2011-12-06 17:12       ` Ingo Molnar
2011-12-12 18:33         ` Ingo Molnar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.