From patchwork Fri Jun 17 10:12:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102164 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp199032qgy; Fri, 17 Jun 2016 03:10:59 -0700 (PDT) X-Received: by 10.66.253.70 with SMTP id zy6mr1516896pac.55.1466158259619; Fri, 17 Jun 2016 03:10:59 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e128si11740357pfe.226.2016.06.17.03.10.59; Fri, 17 Jun 2016 03:10:59 -0700 (PDT) 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 S1755461AbcFQKK5 (ORCPT + 30 others); Fri, 17 Jun 2016 06:10:57 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:57092 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753211AbcFQKKz (ORCPT ); Fri, 17 Jun 2016 06:10:55 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0LyBrp-1bRiPw23Of-015bk8; Fri, 17 Jun 2016 12:10:45 +0200 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Charles Keepax , Richard Fitzgerald , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC fix up SND_SOC_WM8985 dependency Date: Fri, 17 Jun 2016 12:12:00 +0200 Message-Id: <20160617101230.2052826-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:RhQFiUsqzVatkiAbDeY9vUuLgPT3t2dNdtDxMsZ1/KN5nz1/dd1 zbAHut4BvQsFc06snOpPoVBd1SYpICkGNDvobNUGBLJxdGzWqFK6dskgXAzw57NGugRAOib mt5aSRkHXOTgZWJ+pWQhPgcmfUFnbbvSAV+fuQu2q05FM7HfhkpcsJX60k9KjAy/oJvAmCo t0zCXA5X77kX8+rxmoSCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Buj+6afm0o8=:gtBxeWbyPuY5C1DAbS1QR5 YhIWHQqFnyYkALK6RR7fDS7rdwaAbQPS6v6bRQAUuF/5waHbsHW43wRsJAkrluxesDWrQb74n Rs/5vEJcRkdKAsdczRe7Alzs1VT4DxYXbLAmdHsPOhp57m0tR2EPAGZJW1VOwIYugvmskvZuc T0PausTVTnPwXLm9WZDJogCaNeBIkoi7OkVE6bS701X2G/DD/0bGqeWD1k6Tq7M9PJBeuqRZJ QogX/iyNWxkKOmTy2+R16Z1vDlMSwjOsh8Q906in7thCV4C25jMG0c1i25ArBjFtRiKqR66eS RhI2LER3NG6f3DaHeGdQ7jXwUeOmuvJmUowGB9fBtw0RCVeYYZl7twCP3VyFKtl42g9K+Dvsb QgxnkSLQ3/fKZnNe1kT4OtPICqQTRkCpeYFF+fs/m2XkI6vPnMz19QSrNUtTS65pmz1ZeGstT Mi2L8tvEEeyGhLZYX4aSmLGTwGhI37KNiLIHSc7VXTZJocQnJmTOrYDIpKsXOzVBIp4CFIXwo GprXnOiiiAe5NzLNzYH+lWrA+9ZgG1XcHidScPORvbpR8veTkYDyJ/nPmte/Y0344+Nht2mu4 5bGwzQc5uUvmEKdB3UOCg8Fu+zcWMD5NZf1PealdZVUhZcZNzEXyH5MnXHlIZtwNLSqzfuTIm Gnio3GfJIx2XEWz9HkC03FcLABQj0yKSRrhMtAaWZRlwPD4KKcpPGWihQw+zqq25RwAw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I just added an I2C dependency to the wm8985 driver to work around a build failure, but it turns out that was premature: we actually need to depend on SND_SOC_I2C_AND_SPI, as the driver can work with either of the two, and we only need to prevent a configuration that has I2C=m and SND_SOC_WM8985=y. Signed-off-by: Arnd Bergmann Fixes: 05252513fbb9 ("ASoC: wm8985: add i2c dependency") --- sound/soc/codecs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d0e8150c7170..60f8f13f0d34 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -994,7 +994,7 @@ config SND_SOC_WM8983 config SND_SOC_WM8985 tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver" - depends on I2C + depends on SND_SOC_I2C_AND_SPI config SND_SOC_WM8988 tristate