diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:01:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:01:30 +0200 |
| commit | 580287628cdd99366b10c9050c4479b387283be8 (patch) | |
| tree | 754d9fe5d15db31497e45d542e816895d20a7e92 /drivers/mfd/Makefile | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/same... (diff) | |
| parent | regulator: Remove default DEBUG define from TPS6586x (diff) | |
| download | linux-580287628cdd99366b10c9050c4479b387283be8.tar.xz linux-580287628cdd99366b10c9050c4479b387283be8.zip | |
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/Makefile')
| -rw-r--r-- | drivers/mfd/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 1e48d7e3e884..feaeeaeeddb7 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -58,6 +58,7 @@ obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o obj-$(CONFIG_PMIC_DA903X) += da903x.o max8925-objs := max8925-core.o max8925-i2c.o obj-$(CONFIG_MFD_MAX8925) += max8925.o +obj-$(CONFIG_MFD_MAX8998) += max8998.o pcf50633-objs := pcf50633-core.o pcf50633-irq.o obj-$(CONFIG_MFD_PCF50633) += pcf50633.o |