diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-02-25 16:14:13 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-02-25 16:14:13 +0100 |
| commit | defc1c55e1ca83a033a71e4f136ff6a0ee4688fc (patch) | |
| tree | 7935a7c36bb106b7a2ad2f63eae912e76d104315 | |
| parent | 940febdf80c110697f85e6d8f0795389cf10d5f4 (diff) | |
| parent | a163f3690a868e6889a7a2dac58dd86772dc90e4 (diff) | |
| download | kernel-defc1c55e1ca83a033a71e4f136ff6a0ee4688fc.tar.gz kernel-defc1c55e1ca83a033a71e4f136ff6a0ee4688fc.tar.xz kernel-defc1c55e1ca83a033a71e4f136ff6a0ee4688fc.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA | 2 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA index 9e51d92bb..d9117e04e 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA @@ -1 +1 @@ -CONFIG_SERIAL_PXA=y +# CONFIG_SERIAL_PXA is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE deleted file mode 100644 index 66ca5b372..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SERIAL_PXA_CONSOLE=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index dd6d82fe0..8c225ae8f 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -5546,8 +5546,7 @@ CONFIG_SERIAL_MVEBU_UART=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_OMAP is not set # CONFIG_SERIAL_PCH_UART is not set -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_SERIAL_PXA=y +# CONFIG_SERIAL_PXA is not set # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 141dc0d68..10a7cbc7a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -5526,8 +5526,7 @@ CONFIG_SERIAL_MVEBU_UART=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_OMAP is not set # CONFIG_SERIAL_PCH_UART is not set -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_SERIAL_PXA=y +# CONFIG_SERIAL_PXA is not set # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y |