[s3c24xx] Post cleanup cleanup

[openwrt.git] / 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 efa1699..8c93bcb 100644 (file)
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig
+++ b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig
@@ -1,5 +1,6 @@
 config MFD_GLAMO
        bool "Smedia Glamo 336x/337x support"
 config MFD_GLAMO
        bool "Smedia Glamo 336x/337x support"

+       select MFD_CORE

        help
          This enables the core driver for the Smedia Glamo 336x/337x
          multi-function device.  It includes irq_chip demultiplex as
        help
          This enables the core driver for the Smedia Glamo 336x/337x
          multi-function device.  It includes irq_chip demultiplex as


@@ -22,35 +23,16 @@ config MFD_GLAMO_FB
 
          If unsure, say N.
 
 
          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
        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
        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"
 
 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
        help
          This selects a driver for the MCI interface found in
          the S-Media GLAMO chip, as used in Openmoko