diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-10-23 17:14:11 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-10-23 17:14:11 +0200 |
| commit | 44bf67f32a6803339ac1ba721b158c3e2272cabe (patch) | |
| tree | 1ed93503a4a1d20005b85df91bd81e5f5982f348 /drivers/tty/serial/Kconfig | |
| parent | Revert "drm/omap: add OMAP_BO flags to affect buffer allocation" (diff) | |
| parent | Merge v5.4-rc4 into drm-next (diff) | |
| download | linux-44bf67f32a6803339ac1ba721b158c3e2272cabe.tar.xz linux-44bf67f32a6803339ac1ba721b158c3e2272cabe.zip | |
Merge drm/drm-next into drm-misc-next
Parroting Daniel's backmerge justification from
2e79e22e092acd55da0b2db066e4826d7d152c41:
Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/tty/serial/Kconfig')
| -rw-r--r-- | drivers/tty/serial/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 4789b5d62f63..67a9eb3f94ce 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1032,6 +1032,7 @@ config SERIAL_SIFIVE_CONSOLE bool "Console on SiFive UART" depends on SERIAL_SIFIVE=y select SERIAL_CORE_CONSOLE + select SERIAL_EARLYCON help Select this option if you would like to use a SiFive UART as the system console. |