From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Wed, 18 Oct 2017 13:55:44 +0000 (+0200)
Subject: Merge branch 'reset/arc' into reset/next
X-Git-Tag: v4.15~380^2~17^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=542befbb18056c4fda7b458aa6146a52b2fd389c;p=mirror_ubuntu-bionic-kernel.git

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
---

542befbb18056c4fda7b458aa6146a52b2fd389c
diff --cc drivers/reset/Makefile
index 48b64d63b75a,7579dba7b185..8a99f12b8554
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@@ -4,8 -4,9 +4,9 @@@ 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_V1) += reset-hsdk-v1.o
 +obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o
  obj-$(CONFIG_RESET_IMX7) += reset-imx7.o
  obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o
  obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o