diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-25 17:15:13 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-25 17:15:13 +0200 |
commit | 0148cbfface7a5c3e5ff0006a03b702fa433e68c (patch) | |
tree | 885e48a86f1db7911c385f00f9ef30676b43dcb5 /kernel-s390x-debug-fedora.config | |
parent | 223b4a60bc2b6ccc3dd6342f4559358c2f72bddb (diff) | |
parent | 074d4eb8467b9fe0ef8df99a0d08c63dedc25a58 (diff) | |
download | kernel-0148cbfface7a5c3e5ff0006a03b702fa433e68c.tar.gz kernel-0148cbfface7a5c3e5ff0006a03b702fa433e68c.tar.xz kernel-0148cbfface7a5c3e5ff0006a03b702fa433e68c.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc7.20210625git44db63d1ad8d.55.vanilla.1.fc35kernel-5.13.0-0.rc7.20210625git44db63d1ad8d.55.vanilla.1.fc34kernel-5.13.0-0.rc7.20210625git44db63d1ad8d.55.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r-- | kernel-s390x-debug-fedora.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index b36b2017c..8bcac89c8 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3334,6 +3334,7 @@ CONFIG_MLX90614=m CONFIG_MLX90632=m # CONFIG_MLXBF_BOOTCTL is not set # CONFIG_MLXBF_PMC is not set +# CONFIG_MLXBF_TMFIFO is not set CONFIG_MLXFW=m CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m |