diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 15:40:59 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 15:40:59 +0200 |
| commit | b8fd949e585e9b991b36f9edc40ebec1a7dd885b (patch) | |
| tree | 64f0f3c789309835cf4a6a8ff3b8f998037e009e /drivers/mfd/Kconfig | |
| parent | 7d86b44375243ab26a58e598fe13bf72d9a5ab48 (diff) | |
| parent | 3951d7043e3002d34780618cfa2ccf378bd14edd (diff) | |
Merge branch 'glamo-2.6.34' into om-gta02-2.6.34
Conflicts:
drivers/gpio/Makefile
Diffstat (limited to 'drivers/mfd/Kconfig')
| -rw-r--r-- | drivers/mfd/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 8e615af44b5..e0d1b7c761a 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -391,7 +391,14 @@ config LPC_SCH help LPC bridge function of the Intel SCH provides support for System Management Bus and General Purpose I/O. -source "drivers/mfd/glamo/Kconfig" + +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 + well as clock / power management and GPIO support. endmenu |