From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Thu, 28 Jul 2016 13:36:37 +0000 (+0200)
Subject: reset: hi6220: allow to compile test driver on other architectures
X-Git-Tag: v4.9-rc1~77^2~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cddb4800162e543c202cbb05795a324f1093d168;p=thirdparty%2Fkernel%2Flinux.git

reset: hi6220: allow to compile test driver on other architectures

Also remove the RESET_CONTROLLER dependency, this Kconfig file is
included inside the menuconfig already.

Cc: Chen Feng <puck.chen@hisilicon.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---

diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index 56f90eab84cc8..bbe7026617fc7 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,6 +1,6 @@
 obj-y += core.o
+obj-y += hisilicon/
 obj-$(CONFIG_ARCH_STI) += sti/
-obj-$(CONFIG_ARCH_HISI) += hisilicon/
 obj-$(CONFIG_RESET_ATH79) += reset-ath79.o
 obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o
 obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o
diff --git a/drivers/reset/hisilicon/Kconfig b/drivers/reset/hisilicon/Kconfig
index 26bf95a83a8e4..1ff8b0c80980b 100644
--- a/drivers/reset/hisilicon/Kconfig
+++ b/drivers/reset/hisilicon/Kconfig
@@ -1,5 +1,6 @@
 config COMMON_RESET_HI6220
 	tristate "Hi6220 Reset Driver"
-	depends on (ARCH_HISI && RESET_CONTROLLER)
+	depends on ARCH_HISI || COMPILE_TEST
+	default ARCH_HISI
 	help
 	  Build the Hisilicon Hi6220 reset driver.