diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-01 17:50:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-01 17:50:22 +0200 |
commit | 63a3c1c2d41ac5be01713073fd13dbbb6cccc0d8 (patch) | |
tree | 29f8d453aa602401a8be0b109116e37e8abdca98 /kernel-ppc64le.config | |
parent | cc21a9baeb40f98f802c0aa807a2f7c70a060472 (diff) | |
parent | 5c2aa86a1d87d74aeb3969f57626fa565f8db670 (diff) | |
download | kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31.tar.gz kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31.tar.xz kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-ppc64le.config')
-rw-r--r-- | kernel-ppc64le.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index f2f7209f2..06d7c62bb 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4674,7 +4674,6 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=m CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -# CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set CONFIG_SERIAL_8250_MOXA=m @@ -4684,13 +4683,14 @@ CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_8250_RUNTIME_UARTS=32 CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250=y # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_CORE=m +CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y # CONFIG_SERIAL_FSL_LPUART is not set |