From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756931Ab1LGQRY (ORCPT ); Wed, 7 Dec 2011 11:17:24 -0500 Received: from cantor2.suse.de ([195.135.220.15]:33053 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756903Ab1LGQRT (ORCPT ); Wed, 7 Dec 2011 11:17:19 -0500 X-Mailbox-Line: From gregkh@clark.kroah.org Wed Dec 7 08:08:25 2011 Message-Id: <20111207160825.709564278@clark.kroah.org> User-Agent: quilt/0.50-23.1 Date: Wed, 07 Dec 2011 08:06:57 -0800 From: Greg KH To: , , Greg KH Cc: , , , Thomas Weber , Peter Ujfalusi , Samuel Ortiz , Jarkko Nikula Subject: [37/80] revert "mfd: Fix twl4030 dependencies for audio codec" In-Reply-To: <20111207161256.GA7736@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.0-stable review patch. If anyone has any objections, please let me know. ------------------ This reverts commit 11b8fc6ae54bf18a48c94e181c37ca135b858b42, which was commit f09ee0451a44a4e913a7c3cec3805508f7de6c54 upstream. Koen Kooi reports that this shouldn't have been applied to the 3.0 kernel as it isn't relevant there, only 3.1. Reported-by: Koen Kooi Cc: Thomas Weber Cc: Peter Ujfalusi Cc: Samuel Ortiz Cc: Jarkko Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/mfd/twl-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\ +#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\ defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE) #define twl_has_codec() true #else