From patchwork Mon Sep 5 09:26:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 1124732 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p859RcRL029863 for ; Mon, 5 Sep 2011 09:27:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751935Ab1IEJ1M (ORCPT ); Mon, 5 Sep 2011 05:27:12 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:61726 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750802Ab1IEJ1M (ORCPT ); Mon, 5 Sep 2011 05:27:12 -0400 Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0Lualk-1R9Gpg0QlM-00ziVg; Mon, 05 Sep 2011 11:27:08 +0200 Received: from lupus.er.corscience.de (unknown [192.168.102.101]) by corscience.de (Postfix) with ESMTP id 8AC6951FE4; Mon, 5 Sep 2011 11:27:07 +0200 (CEST) From: Thomas Weber To: linux-kernel@vger.kernel.org Cc: peter.ujfalusi@ti.com, sameo@linux.intel.com, linux-omap@vger.kernel.org, broonie@opensource.wolfsonicro.com, tiwai@suse.de, alsa-devel@alsa-project.org, Thomas Weber Subject: [PATCH] ASoC/MFD: twl4030: Fix dependencies for audio codec Date: Mon, 5 Sep 2011 11:26:33 +0200 Message-Id: <1315214793-661-1-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.7.6.1 X-Provags-ID: V02:K0:a0RC5AaUC+OqgRHZYW4soSy2bc0XRi7pkg3kDpOOdmv BOSyHcnRFUUvEY4M8h64tDfRwEcZfsyljSTEaqeHtASktopL/w HEU1wwnJ8NxktZSy7F/JStYMb1TM1SQmD8J8/KaPgxBjjFtqr/ tLxzckUnTKRXNiGOFthBujqZyiZ9Gy0UNKmDwWuPjIedk4eS3H R2AUWNiaR7Xp9IClB4CLNOK2GFTYlwxDvdPsRPj1K/1LHNIJVp CY2FeXpr02MTBoDAh8eoE1I4Rb7YViATBHmNF8NNj89Ua8KI+I uYBbAleYXgEsFCV+x/pEJLM00jKh0E6IBLy1+RycDdHBiSclLp D2LIds28fztFu4LF5Y6U/GNfiBmv06cplwEoak9YWCTRcjyqA/ uBe4xKwPyFKng== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 05 Sep 2011 09:27:41 +0000 (UTC) The codec for Devkit8000 (TWL4030) was not detected except when build with CONFIG_SND_SOC_ALL_CODECS. twl-core.c still uses the CONFIG_TWL4030_CODEC for twl_has_codec(). In commit 57fe7251f5bfc4332f24479376de48a1e8ca6211 the CONFIG_TWL4030_CODEC was renamed into CONFIG_MFD_TWL4030_AUDIO, thatswhy the codec was not detected. This patch renames the CONFIG_ TWL4030_CODEC into CONFIG_MFD_TWL4030_AUDIO in twl-core.c. Signed-off-by: Thomas Weber acked-by: Peter Ujfalusi --- drivers/mfd/twl-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 01ecfee..b8eef46 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -109,7 +109,7 @@ #define twl_has_watchdog() false #endif -#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\ +#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\ defined(CONFIG_TWL6040_CORE) || defined(CONFIG_TWL6040_CORE_MODULE) #define twl_has_codec() true #else