diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:18:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:18:38 +0200 |
| commit | 4734c6efc8c691fda80f11ae00016bc3a8d9ebb5 (patch) | |
| tree | ff27c54c0d9787e3321a8591005b356ea2305ecc /drivers/power/avs/Makefile | |
| parent | 0f4685d0ec9aa1db99f014f8f774518cae085aca (diff) | |
| parent | 7961bb722631cbf0cd68c57f3255ba66e1a879d9 (diff) | |
| download | op-kernel-dev-4734c6efc8c691fda80f11ae00016bc3a8d9ebb5.zip op-kernel-dev-4734c6efc8c691fda80f11ae00016bc3a8d9ebb5.tar.gz | |
Merge branch 'pm-avs'
* pm-avs:
MAINTAINERS: update entry for drivers/power/avs
PM / AVS: rockchip-io: add driver handling Rockchip io domains
regulator: core: Add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE (and ABORT)
Diffstat (limited to 'drivers/power/avs/Makefile')
| -rw-r--r-- | drivers/power/avs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile index 0843386..ba4c7bc 100644 --- a/drivers/power/avs/Makefile +++ b/drivers/power/avs/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_POWER_AVS_OMAP) += smartreflex.o +obj-$(CONFIG_ROCKCHIP_IODOMAIN) += rockchip-io-domain.o |
