diff options
| author |   Olof Johansson <olof@lixom.net> | 2016-06-03 12:18:58 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-03 12:18:58 -0700 |
| commit | e7a6bb9a05ea9d755f7fc78bd5b8a16632a26fb8 (patch) | |
| tree | e8c66ed4e5662ced238a9218826e53a6d5a80e8d /drivers/reset/Kconfig | |
| parent | Linux 4.7-rc1 (diff) | |
| parent | reset: Return -ENOTSUPP when not configured (diff) | |
Merge tag 'reset-for-4.8' of git://git.pengutronix.de/git/pza/linux into next/drivers
Reset controller changes for v4.8
- add devm_reset_controller_register API to get rid of a good
amount of boilerplate across reset drivers.
- move reset controller Kconfig options into a sub-menu
- fix inconsistent return values, let all reset_control_get
stubs return -ENOTSUPP
* tag 'reset-for-4.8' of git://git.pengutronix.de/git/pza/linux:
reset: Return -ENOTSUPP when not configured
reset: oxnas: Use devm register API and get rid of platform remove
reset: fix Kconfig menu to include reset drivers in sub-menu
reset: zynq: use devm_reset_controller_register()
reset: socfpga: use devm_reset_controller_register()
reset: sunxi: use devm_reset_controller_register()
reset: pistachio: use devm_reset_controller_register()
reset: ath79: use devm_reset_controller_register()
reset: add devm_reset_controller_register API
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/reset/Kconfig')
| -rw-r--r-- | drivers/reset/Kconfig | 4 |
1 files changed, 4 insertions, 0 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 If unsure, say no. +if RESET_CONTROLLER + config RESET_OXNAS bool source "drivers/reset/sti/Kconfig" source "drivers/reset/hisilicon/Kconfig" + +endif |