diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2017-10-18 15:55:44 +0200 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2017-10-18 15:59:30 +0200 |
| commit | 542befbb18056c4fda7b458aa6146a52b2fd389c (patch) | |
| tree | 5963eb9f0e4acda6ef6ac5cb3e82d83fafdd389f /drivers/reset/Makefile | |
| parent | f0e0ada67dfd8342fd411da6e3bff10ff9bcc97b (diff) | |
| parent | 376349232a93645624426db782cafe688054e6d6 (diff) | |
Merge branch 'reset/arc' into reset/next
Merge the AXS10x driver, which is also merged into
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git for-next
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 48b64d63b75a..8a99f12b8554 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_ARCH_STI) += sti/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o obj-$(CONFIG_RESET_ATH79) += reset-ath79.o +obj-$(CONFIG_RESET_AXS10X) += reset-axs10x.o obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o obj-$(CONFIG_RESET_IMX7) += reset-imx7.o |