diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-16 13:32:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-16 13:32:46 +1100 |
| commit | 0a94ff85350a01911a00ae756839d4d93a88f2b5 (patch) | |
| tree | bc3985b6d874ffd47f583a12c6e645516f490d9f /drivers/regulator/Makefile | |
| parent | ac0f70627a43355e5ca23dcd562eb1464869d832 (diff) | |
| parent | 258e3427f83a573d738344c2f5499da5e026e1df (diff) | |
Merge remote branch 'voltage/for-next'
Conflicts:
drivers/mfd/Kconfig
drivers/mfd/Makefile
Diffstat (limited to 'drivers/regulator/Makefile')
| -rw-r--r-- | drivers/regulator/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 4257a8683778..c1961e285773 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o +obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o @@ -25,5 +26,6 @@ obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o +obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG |