diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/mfd/Kconfig | |
| parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
| parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/mfd/Kconfig')
| -rw-r--r-- | drivers/mfd/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 10c44d3fe01a..5dba1651f9cc 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
| @@ -50,6 +50,15 @@ config HTC_PASIC3 | |||
| 50 | HTC Magician devices, respectively. Actual functionality is | 50 | HTC Magician devices, respectively. Actual functionality is |
| 51 | handled by the leds-pasic3 and ds1wm drivers. | 51 | handled by the leds-pasic3 and ds1wm drivers. |
| 52 | 52 | ||
| 53 | config UCB1400_CORE | ||
| 54 | tristate "Philips UCB1400 Core driver" | ||
| 55 | help | ||
| 56 | This enables support for the Philips UCB1400 core functions. | ||
| 57 | The UCB1400 is an AC97 audio codec. | ||
| 58 | |||
| 59 | To compile this driver as a module, choose M here: the | ||
| 60 | module will be called ucb1400_core. | ||
| 61 | |||
| 53 | config MFD_TMIO | 62 | config MFD_TMIO |
| 54 | bool | 63 | bool |
| 55 | default n | 64 | default n |