diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-05-03 02:29:52 -0400 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-05-30 03:37:47 -0400 |
commit | 998cd4637f698b04a464f0fbb25e814651979135 (patch) | |
tree | 236b9bffa2192038d227dec0cd2287e1f3989717 | |
parent | da1fda2a2398960f7f7eb1ee3fb0e50155fde275 (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/Kconfig | 4 | ||||
-rw-r--r-- | drivers/reset/sti/Kconfig | 1 |
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 | ||
15 | if RESET_CONTROLLER | ||
16 | |||
15 | config RESET_OXNAS | 17 | config RESET_OXNAS |
16 | bool | 18 | bool |
17 | 19 | ||
18 | source "drivers/reset/sti/Kconfig" | 20 | source "drivers/reset/sti/Kconfig" |
19 | source "drivers/reset/hisilicon/Kconfig" | 21 | source "drivers/reset/hisilicon/Kconfig" |
22 | |||
23 | endif | ||
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 | ||
3 | config STI_RESET_SYSCFG | 3 | config STI_RESET_SYSCFG |
4 | bool | 4 | bool |
5 | select RESET_CONTROLLER | ||
6 | 5 | ||
7 | config STIH415_RESET | 6 | config STIH415_RESET |
8 | bool | 7 | bool |