--- linux-2.6.39.2/drivers/gpio/Kconfig.orig	2011-06-23 16:06:00.000000000 -0600
+++ linux-2.6.39.2/drivers/gpio/Kconfig	2011-06-29 22:43:23.000000000 -0600
@@ -298,7 +298,7 @@ comment "PCI GPIO expanders:"
 
 config GPIO_CS5535
 	tristate "AMD CS5535/CS5536 GPIO support"
-	depends on PCI && X86 && !CS5535_GPIO
+	depends on PCI && X86 && !CS5535_GPIO && MFD_CS5535
 	help
 	  The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
 	  can be used for quite a number of things.  The CS5535/6 is found on