From: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx> Fix up configs with SND_SOC_NAU8315 mismatch Upstream commit ba7523bb0f494fc440d3a9bb0b665cfcaa192d0c now selects SND_SOC_NAU8315 if SND_SOC_INTEL_SOF_NAU8825_MACH is set. This forces us to either turn on SND_SOC_NAU8315 or turn off SND_SOC_INTEL_SOF_NAU8825_MACH. I chose the later to keep existing functionality, though can change this for RHEL if it is preferred to turn off SND_SOC_NAU8315. Signed-off-by: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx> diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 b/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 @@ -1 +1 @@ -# CONFIG_SND_SOC_NAU8315 is not set +CONFIG_SND_SOC_NAU8315=m diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_NAU8315 b/redhat/configs/fedora/generic/CONFIG_SND_SOC_NAU8315 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_NAU8315 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_NAU8315=m diff --git a/redhat/configs/pending-ark/generic/CONFIG_SND_SOC_NAU8315 b/redhat/configs/pending-ark/generic/CONFIG_SND_SOC_NAU8315 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_SND_SOC_NAU8315 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_NAU8315=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2245 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
