summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2008-05-07 13:07:38 -0700
committerIngo Molnar <mingo@elte.hu>2008-05-08 15:43:50 +0200
commitcb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0 (patch)
treea14d5849992e74860248b534d13b7071bf82682b
parent547acec7ecc32b14c2740de3f32ce7d1b36a0f69 (diff)
downloadop-kernel-dev-cb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0.zip
op-kernel-dev-cb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0.tar.gz
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>
-rw-r--r--include/asm-x86/geode.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h
index 8a53bc8..6e64588 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 */
OpenPOWER on IntegriCloud