aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 18:24:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 18:24:35 -0400
commit811158b147a503fbdf9773224004ffd32002d1fe (patch)
tree0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /drivers/mfd
parent4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff)
parentb26e0ed4936b743b693a4cc1413561fa3e4eaf65 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits) trivial: Update my email address trivial: NULL noise: drivers/mtd/tests/mtd_*test.c trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h trivial: Fix misspelling of "Celsius". trivial: remove unused variable 'path' in alloc_file() trivial: fix a pdlfush -> pdflush typo in comment trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL trivial: wusb: Storage class should be before const qualifier trivial: drivers/char/bsr.c: Storage class should be before const qualifier trivial: h8300: Storage class should be before const qualifier trivial: fix where cgroup documentation is not correctly referred to trivial: Give the right path in Documentation example trivial: MTD: remove EOL from MODULE_DESCRIPTION trivial: Fix typo in bio_split()'s documentation trivial: PWM: fix of #endif comment trivial: fix typos/grammar errors in Kconfig texts trivial: Fix misspelling of firmware trivial: cgroups: documentation typo and spelling corrections trivial: Update contact info for Jochen Hein trivial: fix typo "resgister" -> "register" ...
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 06a2b0f7737..75f35dbb11d 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -88,7 +88,7 @@ config MENELAUS
88 help 88 help
89 If you say yes here you get support for the Texas Instruments 89 If you say yes here you get support for the Texas Instruments
90 TWL92330/Menelaus Power Management chip. This include voltage 90 TWL92330/Menelaus Power Management chip. This include voltage
91 regulators, Dual slot memory card tranceivers, real-time clock 91 regulators, Dual slot memory card transceivers, real-time clock
92 and other features that are often used in portable devices like 92 and other features that are often used in portable devices like
93 cell phones and PDAs. 93 cell phones and PDAs.
94 94