aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-05-03 02:29:52 -0400
committerPhilipp Zabel <p.zabel@pengutronix.de>2016-05-30 03:37:47 -0400
commit998cd4637f698b04a464f0fbb25e814651979135 (patch)
tree236b9bffa2192038d227dec0cd2287e1f3989717
parentda1fda2a2398960f7f7eb1ee3fb0e50155fde275 (diff)
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>
-rw-r--r--drivers/reset/Kconfig4
-rw-r--r--drivers/reset/sti/Kconfig1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 0b2733db0e9e..ab37f4db9642 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -12,8 +12,12 @@ menuconfig RESET_CONTROLLER
12 12
13 If unsure, say no. 13 If unsure, say no.
14 14
15if RESET_CONTROLLER
16
15config RESET_OXNAS 17config RESET_OXNAS
16 bool 18 bool
17 19
18source "drivers/reset/sti/Kconfig" 20source "drivers/reset/sti/Kconfig"
19source "drivers/reset/hisilicon/Kconfig" 21source "drivers/reset/hisilicon/Kconfig"
22
23endif
diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
index f8c15a37fb35..613178553612 100644
--- a/drivers/reset/sti/Kconfig
+++ b/drivers/reset/sti/Kconfig
@@ -2,7 +2,6 @@ if ARCH_STI
2 2
3config STI_RESET_SYSCFG 3config STI_RESET_SYSCFG
4 bool 4 bool
5 select RESET_CONTROLLER
6 5
7config STIH415_RESET 6config STIH415_RESET
8 bool 7 bool