diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-11-28 06:42:47 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-11-28 06:42:47 +0000 |
| commit | 89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4 (patch) | |
| tree | d4dc1e1bc522d578faac63504fabed319e842197 /config-s390x | |
| parent | 38c76ac35533ae3c8ffd98c03843a278d8a464f4 (diff) | |
| download | kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.tar.gz kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.tar.xz kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.zip | |
Minor ARM config updates, Enable two 802.15.4 drivers, General config cleanups (NFC: move some x86 specific configs to x86, EDAC generic to generic, some minor seonsor cleanups)
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 |