diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-30 18:19:14 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-30 18:19:14 +0100 |
| commit | 89fb41d614bff1ce370a38043d2bd924655a92b1 (patch) | |
| tree | 05271057fdb948fa9ec2e957b9681e7991de9c4b /kernel-s390x.config | |
| parent | 4a446cdd8ce07b5d9db6c845180acc3547275489 (diff) | |
| parent | 0ccd979b76fd871c4dfd4a50d84e44fd5a3daa75 (diff) | |
| download | kernel-89fb41d614bff1ce370a38043d2bd924655a92b1.tar.gz kernel-89fb41d614bff1ce370a38043d2bd924655a92b1.tar.xz kernel-89fb41d614bff1ce370a38043d2bd924655a92b1.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc4.git2.1.vanilla.knurd.1.fc30kernel-5.0.0-0.rc4.git2.1.vanilla.knurd.1.fc29kernel-5.0.0-0.rc4.git2.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index e5415f0f1..13857bbe4 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2323,7 +2323,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_ZHENHUA=m # CONFIG_JSA1212 is not set -CONFIG_JUMP_LABEL=y +# CONFIG_JUMP_LABEL is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y |