From cb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0 Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Wed, 7 May 2008 13:07:38 -0700
Subject: [PATCH] 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>
---
include/asm-x86/geode.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h
index 8a53bc817230..6e6458853a36 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 */
--
GitLab