commit 998cd4637f698b04a464f0fbb25e814651979135
author Masahiro Yamada <yamada.masahiro@socionext.com> Tue May 03 15:29:52 2016 +0900
committer Philipp Zabel <p.zabel@pengutronix.de> Mon May 30 09:37:47 2016 +0200
tree 236b9bffa2192038d227dec0cd2287e1f3989717
parent da1fda2a2398960f7f7eb1ee3fb0e50155fde275

reset: fix Kconfig menu to include reset drivers in sub-menu

In "make menuconfig", reset drivers are currently lined up together
with the reset sub-system menu, like this:

    -*- Reset Controller Support  ----
    < > Hi6220 Reset Driver

(It also means, the menu "Reset Controller Support" is always empty.)

"Hi6220 Reset Driver" should go into the sub-menu of the
"Reset Controller Support".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

drivers/reset/Kconfig

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 0b2733d..ab37f4d 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -12,8 +12,12 @@
 
 	  If unsure, say no.
 
+if RESET_CONTROLLER
+
 config RESET_OXNAS
 	bool
 
 source "drivers/reset/sti/Kconfig"
 source "drivers/reset/hisilicon/Kconfig"
+
+endif

drivers/reset/sti/Kconfig

diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
index f8c15a3..6131785 100644
--- a/drivers/reset/sti/Kconfig
+++ b/drivers/reset/sti/Kconfig
@@ -2,7 +2,6 @@
 
 config STI_RESET_SYSCFG
 	bool
-	select RESET_CONTROLLER
 
 config STIH415_RESET
 	bool