diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-16 12:59:35 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-16 12:59:35 +0100 |
commit | fc6e7118f816efc699d779601f2051e2103d97a9 (patch) | |
tree | 02659d08d5dee6e9ada783d46f90f6bd707034d3 /kernel-i686-fedora.config | |
parent | c0392d9070cd5a1520ab55432acf401e7f39837b (diff) | |
parent | 571441fd91eb0f407527eb00effc3b431a17bfbb (diff) | |
download | kernel-fc6e7118f816efc699d779601f2051e2103d97a9.tar.gz kernel-fc6e7118f816efc699d779601f2051e2103d97a9.tar.xz kernel-fc6e7118f816efc699d779601f2051e2103d97a9.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc1.20211115git8ab774587903.14.vanilla.1.fc36kernel-5.16.0-0.rc1.20211115git8ab774587903.14.vanilla.1.fc35kernel-5.16.0-0.rc1.20211115git8ab774587903.14.vanilla.1.fc34kernel-5.16.0-0.rc1.20211115git8ab774587903.14.vanilla.1.fc33
Diffstat (limited to 'kernel-i686-fedora.config')
-rw-r--r-- | kernel-i686-fedora.config | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 00f38cadc..983a2faef 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -687,7 +687,7 @@ CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB=m -# CONFIG_BT_HCIBTUSB_MTK is not set +CONFIG_BT_HCIBTUSB_MTK=y CONFIG_BT_HCIBTUSB_RTL=y CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIUART_3WIRE=y @@ -714,7 +714,7 @@ CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_MSFTEXT=y CONFIG_BT_MTKSDIO=m -# CONFIG_BT_MTKUART is not set +CONFIG_BT_MTKUART=m CONFIG_BT_QCA=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y @@ -1533,6 +1533,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set +# CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set # CONFIG_DRM_PANEL_SIMPLE is not set # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set @@ -2217,7 +2218,7 @@ CONFIG_HID_MCP2221=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m CONFIG_HID_MULTITOUCH=m -# CONFIG_HID_NINTENDO is not set +CONFIG_HID_NINTENDO=m CONFIG_HID_NTI=m CONFIG_HID_NTRIG=y CONFIG_HID_ORTEK=m @@ -3102,6 +3103,7 @@ CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m @@ -4461,6 +4463,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set CONFIG_NIC7018_WDT=m CONFIG_NILFS2_FS=m +CONFIG_NINTENDO_FF=y CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m # CONFIG_NL80211_TESTMODE is not set @@ -4951,16 +4954,13 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPTIRQ_EVENTS is not set -# CONFIG_PREEMPT_NONE_BEHAVIOUR is not set -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT is not set +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_PREEMPT=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_PREVENT_FIRMWARE_BUILD=y |