From: Glauber Costa Date: Mon, 16 Jun 2008 22:59:08 +0000 (-0300) Subject: x86: fix typo CONFIX -> CONFIG X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b8e0418b2a25f975c3b8764030c24b7253d33a68;p=deliverable%2Flinux.git x86: fix typo CONFIX -> CONFIG Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 326a8f4f50f8..fd680c73ba77 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -68,7 +68,7 @@ static inline unsigned int get_nmi_count(int cpu) static inline int mce_in_progress(void) { -#if defined(CONFIX_X86_64) && defined(CONFIG_X86_MCE) +#if defined(CONFIG_X86_64) && defined(CONFIG_X86_MCE) return atomic_read(&mce_entry) > 0; #endif return 0;