From: Randy Dunlap <rdunlap@xenotime.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
x86 maintainers <x86@kernel.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
Date: Thu, 29 Sep 2011 13:35:16 -0700 [thread overview]
Message-ID: <4E84D684.107@xenotime.net> (raw)
In-Reply-To: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
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 <rdunlap@xenotime.net>
---
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,
next prev parent reply other threads:[~2011-09-29 20:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-29 6:57 linux-next: Tree for Sept 29 Stephen Rothwell
2011-09-29 19:50 ` linux-next: Tree for Sept 29 (kvm) Randy Dunlap
2011-09-29 22:58 ` Stephen Rothwell
2011-09-30 11:50 ` [PATCH] KVM: x86: Use do_div for tsc deadline calculation Jan Kiszka
2011-09-30 17:35 ` Randy Dunlap
2011-10-02 9:05 ` Avi Kivity
2011-09-29 20:17 ` [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT Randy Dunlap
2011-09-29 20:34 ` Andres Salomon
2011-09-29 20:36 ` Randy Dunlap
2011-10-06 17:12 ` Randy Dunlap
2011-09-29 20:35 ` Randy Dunlap [this message]
2011-09-29 22:57 ` [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled Alan Cox
2011-09-29 23:10 ` Andrew Morton
2011-09-30 9:07 ` Alan Cox
2011-09-29 23:16 ` Randy Dunlap
2011-09-30 9:04 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E84D684.107@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.