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: 9183217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB50C6075F for ; Fri, 17 Jun 2016 10:11:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB38E28388 for ; Fri, 17 Jun 2016 10:11:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFE2328399; Fri, 17 Jun 2016 10:11:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56CEE28388 for ; Fri, 17 Jun 2016 10:11:16 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 40CE126584D; Fri, 17 Jun 2016 12:11:15 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5AAA1265388; Fri, 17 Jun 2016 12:10:59 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 572762655DE; Fri, 17 Jun 2016 12:10:57 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) by alsa0.perex.cz (Postfix) with ESMTP id 108AA26154F for ; Fri, 17 Jun 2016 12:10:49 +0200 (CEST) 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 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= Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Liam Girdwood , linux-kernel@vger.kernel.org, Charles Keepax , Richard Fitzgerald Subject: [alsa-devel] [PATCH] ASoC fix up SND_SOC_WM8985 dependency X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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