diff --git a/[refs] b/[refs]
index a5a813806895..c5a1032358da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 547acec7ecc32b14c2740de3f32ce7d1b36a0f69
+refs/heads/master: cb3f43b22bbb5ddbf6ce3e2bac40ce6eba30aba0
diff --git a/trunk/include/asm-x86/geode.h b/trunk/include/asm-x86/geode.h
index 8a53bc817230..6e6458853a36 100644
--- a/trunk/include/asm-x86/geode.h
+++ b/trunk/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 */