From: Justin M. Forbes <jforbes(a)fedoraproject.org&gt; Flip CONFIG_SND_SOC_CS35L56_SDW to m and clean up Upstream commit 4754e29c779fe makes SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select SND_SOC_CS35L56. This was previously disabled in RHEL and the new select results in a mismatch. Let's turn on CONFIG_SND_SOC_CS35L56_SDW for x86 in common, and lean up all of the other references to it. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org&gt; diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L56_SDW deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L56_SDW +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC_CS35L56_SDW is not set diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/common/generic/x86/CONFIG_SND_SOC_CS35L56_SDW rename from redhat/configs/fedora/generic/CONFIG_SND_SOC_CS35L56_SDW rename to redhat/configs/common/generic/x86/CONFIG_SND_SOC_CS35L56_SDW index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_CS35L56_SDW +++ b/redhat/configs/common/generic/x86/CONFIG_SND_SOC_CS35L56_SDW diff --git a/redhat/configs/pending-rhel/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_CS35L56_SDW rename from redhat/configs/pending-rhel/generic/CONFIG_SND_SOC_CS35L56_SDW rename to redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_CS35L56_SDW index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/CONFIG_SND_SOC_CS35L56_SDW +++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_CS35L56_SDW diff --git a/redhat/configs/rhel/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/rhel/generic/CONFIG_SND_SOC_CS35L56_SDW deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_SND_SOC_CS35L56_SDW +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC_CS35L56_SDW is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2690