X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f35d974a507da20526ff3af8a9bcf5362f64e428..HEAD:/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig

diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig
index c27c13089..8c93bcbdb 100644
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig
+++ b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig
@@ -23,35 +23,16 @@ config MFD_GLAMO_FB
 
 	  If unsure, say N.
 
-config MFD_GLAMO_FB_XGLAMO_WORKAROUND
-	bool "Smedia Glamo 336x/337x Xglamo rotation workaround"
-	depends on MFD_GLAMO_FB
-	help
-	  This is a workaround for a Xglamo bug. This should be fixed
-	  in Xglamo and not in kernel space.
-
-	  If unsure, say N.
-
-
-config MFD_GLAMO_SPI_GPIO
-	tristate "Glamo GPIO SPI bitbang support"
+config MFD_GLAMO_GPIO
+	tristate "Glamo GPIO support"
 	depends on MFD_GLAMO
-	select SPI_BITBANG
-
-	help
-          Enable a bitbanging SPI adapter driver for the Smedia Glamo.
 
-config MFD_GLAMO_SPI_FB
-	tristate "Glamo LCM control channel SPI support"
-	depends on MFD_GLAMO_FB
 	help
-	  Enable a bitbanging SPI adapter driver for the Smedia Glamo LCM
-	  control channel.  This SPI interface is frequently used to
-	  interconnect the LCM control interface.
+		Enable a bitbanging SPI adapter driver for the Smedia Glamo.
 
 config MFD_GLAMO_MCI
 	tristate "Glamo S3C SD/MMC Card Interface support"
-	depends on MFD_GLAMO && MMC
+	depends on MFD_GLAMO && MMC && REGULATOR
 	help
 	  This selects a driver for the MCI interface found in
 	  the S-Media GLAMO chip, as used in Openmoko