diff options
| author | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:44:14 +0100 |
|---|---|---|
| committer | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:44:14 +0100 |
| commit | 3a83621f0e6a52eff7402702b0774092cc7b0187 (patch) | |
| tree | 0962d7359b5b15176a87d03b80be7ba70e252313 /drivers/mfd/glamo | |
| parent | 6e278419626d23b3c15e4cb0ee3b56ce4ab99f87 (diff) | |
| parent | 23b564c9d22cc5e442361e632626d5f131c40752 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Diffstat (limited to 'drivers/mfd/glamo')
| -rw-r--r-- | drivers/mfd/glamo/Kconfig | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index eaa415df890..9c5b11b8372 100644 --- a/drivers/mfd/glamo/Kconfig +++ b/drivers/mfd/glamo/Kconfig @@ -33,18 +33,20 @@ config MFD_GLAMO_FB_XGLAMO_WORKAROUND config MFD_GLAMO_SPI_GPIO - tristate "Glamo GPIO SPI bitbang support" - depends on MFD_GLAMO - help - Enable a bitbanging SPI adapter driver for the Smedia Glamo. + tristate "Glamo GPIO SPI bitbang 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. + 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. config MFD_GLAMO_MCI tristate "Glamo S3C SD/MMC Card Interface support" |