aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/hvc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-11 08:55:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-11 08:55:10 +0200
commit1cc18584e5acfd845464616b66fb2fd81eff467e (patch)
tree4b16a54c9dd234c5fe9efb9b346249003b588e09 /drivers/tty/hvc
parentserial: samsung: 32-bit access for TX/RX hold registers (diff)
parentLinux 5.7-rc5 (diff)
downloadlinux-dev-1cc18584e5acfd845464616b66fb2fd81eff467e.tar.xz
linux-dev-1cc18584e5acfd845464616b66fb2fd81eff467e.zip
Merge 5.7-rc5 into tty-next
We need the tty fixes in here too. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/hvc')
-rw-r--r--drivers/tty/hvc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index 31b7e1b03749..d1b27b0522a3 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -88,7 +88,7 @@ config HVC_DCC
config HVC_RISCV_SBI
bool "RISC-V SBI console support"
- depends on RISCV_SBI
+ depends on RISCV_SBI_V01
select HVC_DRIVER
help
This enables support for console output via RISC-V SBI calls, which