diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-02 18:04:55 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-02 18:04:55 +0100 |
| commit | d639d3a33dc897404dbeb313f508e27aedb3ba79 (patch) | |
| tree | 58ed511b2addd7465f5d4035f35735978fd8dbab /kernel-s390x-fedora.config | |
| parent | e3fb78763aff73594a9330b25f338764d50db3f8 (diff) | |
| parent | 56bcd81089934f3d0b034b4c71de98ba60dd2774 (diff) | |
| download | kernel-d639d3a33dc897404dbeb313f508e27aedb3ba79.tar.gz kernel-d639d3a33dc897404dbeb313f508e27aedb3ba79.tar.xz kernel-d639d3a33dc897404dbeb313f508e27aedb3ba79.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc6.20201202git509a15421674.91.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index db8e42dd8..73feb5a19 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2596,23 +2596,23 @@ CONFIG_JOYSTICK_IFORCE=m CONFIG_JOYSTICK_IFORCE_USB=m CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_MAGELLAN=m +# CONFIG_JOYSTICK_MAGELLAN is not set CONFIG_JOYSTICK_PSXPAD_SPI_FF=y CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_PXRC=m CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_STINGER=m +# CONFIG_JOYSTICK_SPACEBALL is not set +# CONFIG_JOYSTICK_SPACEORB is not set +# CONFIG_JOYSTICK_STINGER is not set CONFIG_JOYSTICK_TMDC=m CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_TWIDJOY=m +# CONFIG_JOYSTICK_TWIDJOY is not set CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_JOYSTICK_WARRIOR=m +# CONFIG_JOYSTICK_WARRIOR is not set CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_ZHENHUA=m +# CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JSA1212 is not set CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y |