From patchwork Thu Sep 23 16:11:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 202322 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8NGEZar000556 for ; Thu, 23 Sep 2010 16:14:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755548Ab0IWQOK (ORCPT ); Thu, 23 Sep 2010 12:14:10 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:60869 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755546Ab0IWQOI (ORCPT ); Thu, 23 Sep 2010 12:14:08 -0400 Received: by ewy23 with SMTP id 23so511609ewy.19 for ; Thu, 23 Sep 2010 09:14:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=rOEWPBwk2/qwBLQZnmREM60yEP96VKrs8Rvm7HUbl0I=; b=vQeEHqNoeia3LTIbMFPOPWbUKXuJglvQ3QUKVciSKszJJgGpT/0i/dmrEP0Z2eBKLp xSC8hOpU8uFYjKw66sk5wL49oqd8aLmPoVVX8wxkMHio9Qbr0iCOARBF6LpbeiHt2mYb +WLL0MnuGJaSQGLDUk2t4Ctb5qenUp5MysFFA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=sD/JqsnD/1sfY28kyeThoOfxLk10s+WNe1FzsbchG1z3lKoIHbd31cHhmyxryYqwES EkbhqZJ8vtBvopJKSmpXGeUnh+kgDYoYuRMrvfqrEYEQUdkdE6fLFYsBFr3RnukhxIyJ uWZhgr37BTs/e4aTZsg3dUiUFAu2DF12PwUKA= Received: by 10.213.4.66 with SMTP id 2mr6933034ebq.17.1285258447459; Thu, 23 Sep 2010 09:14:07 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id v59sm1437917eeh.22.2010.09.23.09.14.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 23 Sep 2010 09:14:06 -0700 (PDT) From: Jarkko Nikula To: alsa-devel@alsa-project.org Cc: Liam Girdwood , Mark Brown , linux-omap@vger.kernel.org, Jarkko Nikula , Vikram Pandita , Tony Lindgren Subject: [PATCH 1/2] omap: zoom2: Fix ASoC multi-component build breakage by removing dead code Date: Thu, 23 Sep 2010 19:11:53 +0300 Message-Id: <1285258314-23721-1-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.1 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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 23 Sep 2010 16:14:35 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index efbcd8f..86d4515 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -41,10 +41,6 @@ void zoom2_set_hs_extmute(int mute) gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); } -static struct twl4030_madc_platform_data zoom2_madc_data = { - .irq_line = 1, -}; - static struct twl4030_codec_audio_data zoom2_audio_data = { .audio_mclk = 26000000, .ramp_delay_value = 3, /* 161 ms */ @@ -62,15 +58,7 @@ static struct twl4030_platform_data zoom2_twldata = { .irq_end = TWL4030_IRQ_END, /* platform_data for children goes here */ - .bci = &zoom2_bci_data, - .madc = &zoom2_madc_data, - .usb = &zoom2_usb_data, - .gpio = &zoom2_gpio_data, - .keypad = &zoom2_kp_twl4030_data, .codec = &zoom2_codec_data, - .vmmc1 = &zoom2_vmmc1, - .vmmc2 = &zoom2_vmmc2, - .vsim = &zoom2_vsim, }; static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {