diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
commit | 20afbe1cdd218f149a773c01945893c353fa2c60 (patch) | |
tree | 0e0526ab848c717a7971728347f62a81d1ca9a1b /configs/fedora/generic/s390x | |
parent | 93bf93308b5aad49a6575406966b3ab2047e14d3 (diff) | |
parent | a54055adb14a40ada848c9ef6677cecbc58939e2 (diff) | |
download | kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29.tar.gz kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29.tar.xz kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'configs/fedora/generic/s390x')
5 files changed, 4 insertions, 2 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_PWM new file mode 100644 index 000000000..e867170c2 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_PWM @@ -0,0 +1 @@ +# CONFIG_BACKLIGHT_PWM is not set diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_AUTO b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_AUTO new file mode 100644 index 000000000..465c4673e --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_AUTO @@ -0,0 +1 @@ +CONFIG_EXPOLINE_AUTO=y diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_FULL b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_FULL new file mode 100644 index 000000000..b6ea26036 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_FULL @@ -0,0 +1 @@ +# CONFIG_EXPOLINE_FULL is not set diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM deleted file mode 100644 index 82c8370c3..000000000 --- a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXPOLINE_MEDIUM=y diff --git a/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP b/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP index b3c291602..dd71bbe4a 100644 --- a/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP +++ b/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP @@ -1 +1 @@ -CONFIG_KERNEL_NOBP=y +# CONFIG_KERNEL_NOBP is not set |