Received: by 10.223.185.116 with SMTP id b49csp1034275wrg; Fri, 23 Feb 2018 10:42:47 -0800 (PST) X-Google-Smtp-Source: AH8x224/KD2QcefniDQcEXMH9jNNZp0QjDvQ9aZ3oDg/ULfTkbWOhjEpuQ7MSewRTuMQKly/6vJJ X-Received: by 2002:a17:902:4601:: with SMTP id o1-v6mr2564581pld.210.1519411367399; Fri, 23 Feb 2018 10:42:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519411367; cv=none; d=google.com; s=arc-20160816; b=uutSJF0A2R8bE3rMXlWzDmALOTzpF+gkATF7M4CzN7zJDujAl4PiH/AehUH3fYK1rd gYquwdSYNVabBsdm53HSzMW/V3PrF06pgq3AQLbvMjuaD12PbjxvEaYm91ZNx7qQl1it VPV2l80C+3Y0tSAfc4ygSGe6JudSaPGMfIlH2QEVighz5Dr5eP28EJFd5aJ9d2tzlhzW h/62FLeyzUDho8y9Yo9cQ0rr9Bt6u91lUMrg5lPfH7kbOG8WuNLgNOsvc4qVpZYuq/Xr qPwYiF5B2jHin7mhqR0H2Cm+BYGyNF/HDmL5REli/N0C+LHBSPlDCAzYDZSgoXPrVlnn w6uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ZGu9zD2o+42UjfRjjjbpSxOggDXRSQaKLLy1aqJiIBA=; b=f7n8RRinCTZoLFEJG/+5pAanwdlMm9oZgJqWdvfraQY8McXJa6kg3yrh5EoKFtJ2nP EnQ+JYlkMJDSp+C3x0WGK9XMo5X28GzCadvVxpUy6Lv3HoK47jcn3Oq7+46STbYszgEk D6SwBibclhew2lU2R9lowqvnM/6iemq1c14OYWAtLtlJ3k+MZON5N3eJ6MjCWwbFGGVz bUJ+Ws+hxwUIo00MlyraGcWi/nIYwdCz04Ud2aQboKy+VBlKJpibrs/7JB5qURn8jjR8 Yfh2JOmRZNaHVIcNXvAmFbkwP5t15TMqJsNGTSE3+g0XUr2BnmlGyDGPfd41FLtOcFjr bnwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f90-v6si2145632plb.63.2018.02.23.10.42.33; Fri, 23 Feb 2018 10:42:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932961AbeBWSlz (ORCPT + 99 others); Fri, 23 Feb 2018 13:41:55 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:40782 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932950AbeBWSlu (ORCPT ); Fri, 23 Feb 2018 13:41:50 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 1D54E71F; Fri, 23 Feb 2018 18:41:49 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Randy Dunlap , Vinod Koul , Mark Brown , Arnd Bergmann Subject: [PATCH 4.4 157/193] ASoC: Intel: Kconfig: fix build when ACPI is not enabled Date: Fri, 23 Feb 2018 19:26:30 +0100 Message-Id: <20180223170350.512304837@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vinod Koul commit 3493d4a86457c7de9f1e602b4267c9b0f9ec1c9f upstream. Randy reported following error when ACPI is not enabled: warning: (SND_SOC_INTEL_BYTCR_RT5640_MACH && SND_SOC_INTEL_BYTCR_RT5651_MACH && SND_SOC_INTEL_CHT_BSW_RT5672_MACH && SND_SOC_INTEL_CHT_BSW_RT5645_MACH && SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) selects SND_SST_IPC_ACPI +which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && ACPI) causing these build errors: In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:40:0: ../include/acpi/acpi_bus.h:65:20: error: conflicting types for 'acpi_evaluate_dsm' union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:31:0: ../include/linux/acpi.h:676:34: note: previous definition of 'acpi_evaluate_dsm' was here static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle, CONFIG_SND_SST_IPC_ACPI was already dependent upon ACPI, but that was not solving it. So move the depends up to machine drivers and remove from CONFIG_SND_SST_IPC_ACPI. Reported-by: Randy Dunlap Signed-off-by: Vinod Koul Signed-off-by: Mark Brown [arnd: rebased to PATCH kernel] Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- sound/soc/intel/Kconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -24,7 +24,6 @@ config SND_SST_IPC_PCI config SND_SST_IPC_ACPI tristate select SND_SST_IPC - depends on ACPI config SND_SOC_INTEL_SST tristate @@ -91,7 +90,7 @@ config SND_SOC_INTEL_BROADWELL_MACH config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio DSP Support for MID BYT Platform" - depends on X86 && I2C + depends on X86 && I2C && ACPI select SND_SOC_RT5640 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI @@ -103,7 +102,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH config SND_SOC_INTEL_CHT_BSW_RT5672_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec" - depends on X86_INTEL_LPSS && I2C + depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_RT5670 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI @@ -115,7 +114,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH config SND_SOC_INTEL_CHT_BSW_RT5645_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec" - depends on X86_INTEL_LPSS && I2C + depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_RT5645 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI