From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030604Ab2CFMly (ORCPT ); Tue, 6 Mar 2012 07:41:54 -0500 Received: from na3sys009aog107.obsmtp.com ([74.125.149.197]:55189 "EHLO na3sys009aog107.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030440Ab2CFMlx (ORCPT ); Tue, 6 Mar 2012 07:41:53 -0500 Authentication-Results: mr.google.com; spf=pass (google.com: domain of peter.ujfalusi@ti.com designates 10.152.112.100 as permitted sender) smtp.mail=peter.ujfalusi@ti.com MIME-Version: 1.0 From: Peter Ujfalusi To: Samuel Ortiz Cc: Tony Lindgren , Liam Girdwood , Stephen Rothwell , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-next@vger.kernel.org, paul.gortmaker@windriver.com Subject: [PATCH 3/5] Revert "ASoC: Remove twl6040 dependency on twl4030 from Kconfig" Date: Tue, 6 Mar 2012 14:35:14 +0200 Message-Id: <1331037316-7375-4-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.5 In-Reply-To: <1331037316-7375-1-git-send-email-peter.ujfalusi@ti.com> References: <1331037316-7375-1-git-send-email-peter.ujfalusi@ti.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 36229729d92f903a7311f1c040b33d5bab0af60b. Reverting changes regarding to twl6040 in MFD tree since the patches will go via the audio tree. Signed-off-by: Peter Ujfalusi --- sound/soc/codecs/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f1a1197..7c205e7 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -56,7 +56,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_TPA6130A2 if I2C select SND_SOC_TLV320DAC33 if I2C select SND_SOC_TWL4030 if TWL4030_CORE - select SND_SOC_TWL6040 if I2C + select SND_SOC_TWL6040 if TWL4030_CORE select SND_SOC_UDA134X select SND_SOC_UDA1380 if I2C select SND_SOC_WL1273 if MFD_WL1273_CORE -- 1.7.8.5