summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 20:07:22 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 20:07:22 +0200
commit1543966a079fc7065849ae43ca4dd767c188ad55 (patch)
tree760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/mfd/Kconfig
parentMerge branch 'pxa-trizeps' into pxa-machines (diff)
parent[ARM] 5248/1: wm97xx generic battery driver (diff)
downloadlinux-1543966a079fc7065849ae43ca4dd767c188ad55.tar.xz
linux-1543966a079fc7065849ae43ca4dd767c188ad55.zip
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/Kconfig9
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
HTC Magician devices, respectively. Actual functionality is
handled by the leds-pasic3 and ds1wm drivers.
+config UCB1400_CORE
+ tristate "Philips UCB1400 Core driver"
+ help
+ This enables support for the Philips UCB1400 core functions.
+ The UCB1400 is an AC97 audio codec.
+
+ To compile this driver as a module, choose M here: the
+ module will be called ucb1400_core.
+
config MFD_TMIO
bool
default n