diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-29 07:34:45 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-29 07:34:45 +0100 |
| commit | e9a064f5d48dbe8c6e779507a5d0270ffdfe8161 (patch) | |
| tree | 95e7f0bccc57007ba87775dc9dfa3e1bf0ddddae /config-s390x | |
| parent | 5f1b93ee30c89a1f9f3394444462584f4f84761c (diff) | |
| parent | 4a651d61dae250efb3bc5281715525bb3731e274 (diff) | |
| download | kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc26.tar.gz kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc26.tar.xz kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-s390x')
| -rw-r--r-- | config-s390x | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config-s390x b/config-s390x index 89233793f..8ead330ec 100644 --- a/config-s390x +++ b/config-s390x @@ -250,8 +250,7 @@ CONFIG_HOTPLUG_PCI_S390=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set -# CONFIG_GAMEPORT_EMU10K1 is not set -# CONFIG_GAMEPORT_FM801 is not set +# CONFIG_GAMEPORT is not set # CONFIG_SERIO is not set # CONFIG_ACCESSIBILITY is not set |