diff -urN linux-2.6.30/arch/x86/include/asm/geode.h linux-2.6.30.fli4l/arch/x86/include/asm/geode.h
--- linux-2.6.30/arch/x86/include/asm/geode.h	2009-06-10 05:05:27.000000000 +0200
+++ linux-2.6.30.fli4l/arch/x86/include/asm/geode.h	2009-06-10 09:04:07.637037831 +0200
@@ -186,14 +186,7 @@
 	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 */
 
diff -urN linux-2.6.30/arch/x86/Kconfig linux-2.6.30.fli4l/arch/x86/Kconfig
--- linux-2.6.30/arch/x86/Kconfig	2009-06-10 05:05:27.000000000 +0200
+++ linux-2.6.30.fli4l/arch/x86/Kconfig	2009-06-10 09:05:26.276080128 +0200
@@ -1970,7 +1970,7 @@
 config GEODE_MFGPT_TIMER
 	def_bool y
 	prompt "Geode Multi-Function General Purpose Timer (MFGPT) events"
-	depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
+	depends on GENERIC_TIME && GENERIC_CLOCKEVENTS
 	---help---
 	  This driver provides a clock event source based on the MFGPT
 	  timer(s) in the CS5535 and CS5536 companion chip for the geode.
diff -urN linux-2.6.30/arch/x86/kernel/Makefile linux-2.6.30.fli4l/arch/x86/kernel/Makefile
--- linux-2.6.30/arch/x86/kernel/Makefile	2009-06-10 05:05:27.000000000 +0200
+++ linux-2.6.30.fli4l/arch/x86/kernel/Makefile	2009-06-10 09:04:07.641580024 +0200
@@ -82,7 +82,7 @@
 obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
 
 obj-$(CONFIG_K8_NB)		+= k8.o
-obj-$(CONFIG_MGEODE_LX)		+= geode_32.o mfgpt_32.o
+obj-y				+= geode_32.o mfgpt_32.o
 obj-$(CONFIG_DEBUG_RODATA_TEST)	+= test_rodata.o
 obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o
 
diff -urN linux-2.6.30/drivers/watchdog/Kconfig linux-2.6.30.fli4l/drivers/watchdog/Kconfig
--- linux-2.6.30/drivers/watchdog/Kconfig	2009-06-10 05:05:27.000000000 +0200
+++ linux-2.6.30.fli4l/drivers/watchdog/Kconfig	2009-06-10 09:04:07.641580024 +0200
@@ -319,7 +319,6 @@
 
 config GEODE_WDT
 	tristate "AMD Geode CS5535/CS5536 Watchdog"
-	depends on MGEODE_LX
 	help
 	  This driver enables a watchdog capability built into the
 	  CS5535/CS5536 companion chips for the AMD Geode GX and LX