diff options
| author | Olof Johansson <olof@lixom.net> | 2019-09-29 11:19:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-09-29 11:20:41 -0700 |
| commit | a4207a1c5edc3112b3538769024c7b2ad42b9fe9 (patch) | |
| tree | 739b56fe8aba751719cb7c19f528ce2bd0093f24 /drivers/reset/Makefile | |
| parent | b74d957f6317e60924d0d3c0c01750814c24611b (diff) | |
| parent | 61423712dbb86e02af4aa5de65b9041493c92cac (diff) | |
| download | linux-a4207a1c5edc3112b3538769024c7b2ad42b9fe9.tar.gz | |
Merge tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
ARM SCMI fixes for v5.4 Couple of fixes: one in scmi reset driver initialising missed scmi handle and an other in scmi reset API implementation fixing the assignment of reset state * tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: reset: reset-scmi: add missing handle initialisation firmware: arm_scmi: reset: fix reset_state assignment in scmi_domain_reset Link: https://lore.kernel.org/r/20190918142139.GA4370@bogus Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/reset/Makefile')
| -rw-r--r-- | drivers/reset/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 61456b8f659c..cf60ce526064 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o obj-$(CONFIG_RESET_QCOM_AOSS) += reset-qcom-aoss.o obj-$(CONFIG_RESET_QCOM_PDC) += reset-qcom-pdc.o +obj-$(CONFIG_RESET_SCMI) += reset-scmi.o obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o obj-$(CONFIG_RESET_STM32MP157) += reset-stm32mp1.o obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o |