diff options
| author | Olof Johansson <olof@lixom.net> | 2018-08-24 08:49:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-08-24 08:49:48 -0700 |
| commit | c37aad3612c4a9e01ca69ad07b8ca41dbd222c46 (patch) | |
| tree | e4c31d48a1491b8c78825ba5335bf2d59cd7640e /drivers/reset/Makefile | |
| parent | 29ed45fff05899f6f39d05fe1c32b1bc51f8926b (diff) | |
| parent | d903779b58be442f3afd2c51c46c7cf19c97684e (diff) | |
| download | linux-next-c37aad3612c4a9e01ca69ad07b8ca41dbd222c46.tar.gz linux-next-c37aad3612c4a9e01ca69ad07b8ca41dbd222c46.zip | |
Merge tag 'reset-for-4.19-2' of git://git.pengutronix.de/git/pza/linux into next/late
Reset controller changes for v4.19, part 2
This adds a single new driver for the Amlogic Meson Audio Memory Arbiter
resets.
* tag 'reset-for-4.19-2' of git://git.pengutronix.de/git/pza/linux:
reset: meson: add meson audio arb driver
reset: meson: add dt-bindings for meson-axg audio arb
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 0676b6b1976f..4243c38228e2 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_RESET_IMX7) += reset-imx7.o obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o obj-$(CONFIG_RESET_MESON) += reset-meson.o +obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o obj-$(CONFIG_RESET_QCOM_AOSS) += reset-qcom-aoss.o |