diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 06:49:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 06:49:43 +0200 |
commit | 17af4ec052a4e628ec6142e19398fdfabb4206e8 (patch) | |
tree | f8d0953c9460749b598e30a56c3bb325dfc6aeb9 /kernel-x86_64-fedora.config | |
parent | 168917328214e94a54dbd4ef227dab46029b8134 (diff) | |
parent | e9f1331084c27ee3ba0be15c1e5c9eae4b15a6cb (diff) | |
download | kernel-17af4ec052a4e628ec6142e19398fdfabb4206e8.tar.gz kernel-17af4ec052a4e628ec6142e19398fdfabb4206e8.tar.xz kernel-17af4ec052a4e628ec6142e19398fdfabb4206e8.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200611gitb29482fde649.1.vanilla.1.fc31
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index af1feb086..2cb91455d 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2467,6 +2467,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set +CONFIG_INPUT_IQS269A=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -2900,7 +2901,7 @@ CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADP5589 is not set CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_BCM is not set +CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set CONFIG_KEYBOARD_CROS_EC=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set @@ -6272,6 +6273,7 @@ CONFIG_TOUCHSCREEN_AUO_PIXCIR=m # CONFIG_TOUCHSCREEN_BU21029 is not set # CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m +CONFIG_TOUCHSCREEN_CY8CTMA140=m # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set @@ -6961,6 +6963,7 @@ CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set +CONFIG_VIRTIO_MEM=m CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m |