From: Andres Salomon <dilinger@queued.net>
Date: Wed, 7 May 2008 20:07:38 +0000 (-0700)
Subject: x86: geode: define geode_has_vsa2() even if CONFIG_MGEODE_LX is not set
X-Git-Tag: v2.6.26-rc2~7^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0;p=linux-2.6

x86: geode: define geode_has_vsa2() even if CONFIG_MGEODE_LX is not set

We want drivers to be able to use geode_has_vsa2 without having to worry
about what model geode is being compiled for.  This patch ensures that
geode_has_vsa2 is always defined.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h
index 8a53bc8172..6e6458853a 100644
--- a/include/asm-x86/geode.h
+++ b/include/asm-x86/geode.h
@@ -185,7 +185,14 @@ static inline int is_geode(void)
 	return (is_geode_gx() || is_geode_lx());
 }
 
+#ifdef CONFIG_MGEODE_LX
 extern int geode_has_vsa2(void);
+#else
+static inline int geode_has_vsa2(void)
+{
+	return 0;
+}
+#endif
 
 /* MFGPTs */