[PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Randy Dunlap <hidden>
Date: 2011-09-29 20:35:23
Also in:
lkml
From: Randy Dunlap <redacted> Fix build when CONFIG_X86_INTEL_MID is enabled but CONFIG_X86_MRST is not enabled. Fixes this build error: rtc.c:(.init.text+0x2fbb): undefined reference to `__mrst_cpu_chip' Signed-off-by: Randy Dunlap <redacted> --- arch/x86/include/asm/mrst.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
--- next-2011-0929.orig/arch/x86/include/asm/mrst.h
+++ next-2011-0929/arch/x86/include/asm/mrst.h@@ -32,18 +32,18 @@ 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 /* !CONFIG_X86_MRST */ #define mrst_identify_cpu() (0) -#endif /* !CONFIG_X86_INTEL_MID */ +#endif /* !CONFIG_X86_MRST */ enum mrst_timer_options { MRST_TIMER_DEFAULT,