summaryrefslogtreecommitdiff
path: root/drivers/reset/Kconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-15 16:42:06 -0400
committerTom Rini <trini@konsulko.com>2020-05-15 16:42:06 -0400
commit506159549df76034dfbdee562304ce4c102d3a06 (patch)
tree85c116fc3267a1ce16d6771f0a08675788d48ccd /drivers/reset/Kconfig
parent5f09f9af3cc335fe6a74c031cfa0b1d8bdf4b9db (diff)
parent24bf6e84ce22cd1b53cb79e4f89a4036af7e9c6b (diff)
downloadu-boot-506159549df76034dfbdee562304ce4c102d3a06.tar.gz
Merge branch '2020-05-15-misc-bugfixes'
- A number of symbol name consistency updates - JFFS2 bugfix - Use /* fallthrough */ for now to help at least gcc know when we're intentionally not 'break;'ing in a switch statement, we'll adopt fallthrough; later on. - Assorted other fixes
Diffstat (limited to 'drivers/reset/Kconfig')
-rw-r--r--drivers/reset/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 75ccd65799..88d3be1593 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -30,10 +30,10 @@ config STI_RESET
config STM32_RESET
bool "Enable the STM32 reset"
- depends on STM32 || ARCH_STM32MP
+ depends on ARCH_STM32 || ARCH_STM32MP
help
Support for reset controllers on STMicroelectronics STM32 family SoCs.
- This resset driver is compatible with STM32 F4/F7 and H7 SoCs.
+ This reset driver is compatible with STM32 F4/F7 and H7 SoCs.
config TEGRA_CAR_RESET
bool "Enable Tegra CAR-based reset driver"