diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:01:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:01:30 -0400 |
| commit | 580287628cdd99366b10c9050c4479b387283be8 (patch) | |
| tree | 754d9fe5d15db31497e45d542e816895d20a7e92 /drivers/mfd/Kconfig | |
| parent | e83ddb335468cdd9ea6e9767eb30b64d8ff176ce (diff) | |
| parent | 120be663285f80e3501e36ccbb92e7143585fd93 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (22 commits)
regulator: Remove default DEBUG define from TPS6586x
regulator: tps6507x - add missing platform_set_drvdata in tps6507x_pmic_probe
regulator: tps6586x - add regulator_unregister() in tps6586x_regulator_remove()
mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler
regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()
regulator: max8660 - fix a memory leak in max8660_remove()
regulator: max1586 - fix a memory leak in max1586_pmic_remove()
regulator: Default GPIO controlled WM8994 regulators to disabled
regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()
max8998: fix off-by-one value range checking
regulator: tps6586x: fix millivolt return values and SM2 table
regulator: tps6586x: add dependancy on MFD_TPS6585x
regulator: add TPS6586X regulator driver
regulator: MAX8998: set_voltage bugfix. ramp_up delay and min/max voltage
regulator: add support for regulators on the ab8500 MFD
ab8500-mfd: add regulator support to ab8500 mfd device
tps65023: Allow registering similar TPS65021
drivers: regulators: depend on MFD_MAX8998
drivers: regulator: add Maxim 8998 driver
ISL6271A voltage regulator support.
...
Diffstat (limited to 'drivers/mfd/Kconfig')
| -rw-r--r-- | drivers/mfd/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index d75909e7cf2f..db51ea1c6082 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
| @@ -293,6 +293,16 @@ config MFD_MAX8925 | |||
| 293 | accessing the device, additional drivers must be enabled in order | 293 | accessing the device, additional drivers must be enabled in order |
| 294 | to use the functionality of the device. | 294 | to use the functionality of the device. |
| 295 | 295 | ||
| 296 | config MFD_MAX8998 | ||
| 297 | bool "Maxim Semiconductor MAX8998 PMIC Support" | ||
| 298 | depends on I2C=y | ||
| 299 | select MFD_CORE | ||
| 300 | help | ||
| 301 | Say yes here to support for Maxim Semiconductor MAX8998. This is | ||
| 302 | a Power Management IC. This driver provies common support for | ||
| 303 | accessing the device, additional drivers must be enabled in order | ||
| 304 | to use the functionality of the device. | ||
| 305 | |||
| 296 | config MFD_WM8400 | 306 | config MFD_WM8400 |
| 297 | tristate "Support Wolfson Microelectronics WM8400" | 307 | tristate "Support Wolfson Microelectronics WM8400" |
| 298 | select MFD_CORE | 308 | select MFD_CORE |