From patchwork Tue Apr 7 07:14:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1267274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48xJbG5lZdz9sSc; Tue, 7 Apr 2020 17:15:38 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jLiSM-0006yR-0Z; Tue, 07 Apr 2020 07:15:34 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jLiSH-0006tm-SB for kernel-team@lists.ubuntu.com; Tue, 07 Apr 2020 07:15:29 +0000 Received: from [114.254.47.51] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jLiSF-0001HR-N5 for kernel-team@lists.ubuntu.com; Tue, 07 Apr 2020 07:15:28 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 6/6] UBUNTU: [Config] SND_INTEL_DSP_CONFIG=m Date: Tue, 7 Apr 2020 15:14:48 +0800 Message-Id: <20200407071448.16335-13-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200407071448.16335-1-hui.wang@canonical.com> References: <20200407071448.16335-1-hui.wang@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1871284 Signed-off-by: Hui Wang --- debian.master/config/annotations | 5 +++++ debian.master/config/config.common.ubuntu | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index f3d2f3e19b66..665592cf009c 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8206,6 +8206,11 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT policy<{'amd64': '1', 'arm64': ' CONFIG_SND_HDA_RECONFIG note CONFIG_SND_HDA_POWER_SAVE_DEFAULT note +CONFIG_SND_INTEL_NHLT policy<{'amd64': 'y', 'arm64': 'n', 'armhf': 'n', 'i386': 'y', 'ppc64el': 'n', 'riscv64': 'n'}> +CONFIG_SND_INTEL_NHLT note +CONFIG_SND_INTEL_DSP_CONFIG policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'i386': 'm', 'ppc64el': 'n', 'riscv64': 'n'}> +CONFIG_SND_INTEL_DSP_CONFIG note + # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ISA sound devices CONFIG_SND_ISA policy<{'i386': 'y'}> CONFIG_SND_ADLIB policy<{'i386': 'm'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index de028eab1a5a..4e37173ccbb5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -9064,7 +9064,8 @@ CONFIG_SND_INDIGOIO=m CONFIG_SND_INDIGOIOX=m CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m -CONFIG_SND_INTEL_NHLT=m +CONFIG_SND_INTEL_NHLT=y +CONFIG_SND_INTEL_DSP_CONFIG=m CONFIG_SND_INTERWAVE=m CONFIG_SND_INTERWAVE_STB=m CONFIG_SND_ISA=y