From patchwork Tue Sep 30 11:43:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5002371 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7FA51BEEA6 for ; Tue, 30 Sep 2014 11:44:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB757201BC for ; Tue, 30 Sep 2014 11:44:32 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 0AE4F2016C for ; Tue, 30 Sep 2014 11:44:31 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 364912604BD; Tue, 30 Sep 2014 13:44:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 1F29C2604C5; Tue, 30 Sep 2014 13:44:18 +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 F20BD2604CC; Tue, 30 Sep 2014 13:44:16 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by alsa0.perex.cz (Postfix) with ESMTP id 0C0E92604BD for ; Tue, 30 Sep 2014 13:44:09 +0200 (CEST) Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue006) with ESMTP (Nemesis) id 0MJIXG-1XWBka1Ulu-002nRb; Tue, 30 Sep 2014 13:43:42 +0200 From: Arnd Bergmann To: broonie@kernel.org Date: Tue, 30 Sep 2014 13:43:41 +0200 Message-ID: <1950588.ErdGoiHh8p@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:hsrPsY7O52fgx0qXlNC9bQTqotJkEpBp002atqjK05y juCNf+Z0UNuPtBQFVrZvYnKn/FqcGLf5kDFpP4JJZlWrl3XQ5D YJAogiKSMgPbe2a+J5yhjVVNa0k7cQ2wziw98WdkZuiQnRvCbb na/7wqIhDmkY0FKctJrHARuJ9lcqL36GJmH1QvsiArKxktj47C YKEGA5mANjR7bxb/vBEzDmVR0LsRq6YEdXGRCisvn/qzWEC7V4 DPncJ1PN1Eq2ysyTjOWJDYlPX5p16/1aI/PqJnTrmHTOUqu1mI bNAgprz0JdbUMLFMmo737mAntNhyEOG+n3b1jHqEdEId8UJ3Hg HregohxxnFuNEC13uenU= X-UI-Out-Filterresults: notjunk:1; Cc: Nicolin Chen , alsa-devel@alsa-project.org, Liam Girdwood , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH] ASoC: fsl: fix dependencies for wm8962 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The wm8962 driver uses the input subsystem, but is selected by SND_SOC_FSL_ASOC_CARD, which can be built with CONFIG_INPUT disabled, resulting in this link error: ERROR: "input_event" [sound/soc/codecs/snd-soc-wm8962.ko] undefined! ERROR: "input_register_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined! ERROR: "devm_input_allocate_device" [sound/soc/codecs/snd-soc-wm8962.ko] undefined! This adds an explicit Kconfig dependency to prevent this configuration from being used. Signed-off-by: Arnd Bergmann Fixes: 708b4351f08 ("ASoC: fsl: Add Freescale Generic ASoC Sound Card with ASRC support") diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 6164e78b466a..99e9386f7956 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -282,7 +282,7 @@ config SND_SOC_IMX_MC13783 config SND_SOC_FSL_ASOC_CARD tristate "Generic ASoC Sound Card with ASRC support" - depends on OF && I2C + depends on OF && I2C && INPUT select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_PCM_DMA select SND_SOC_FSL_ESAI