From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753482AbZKBBWY (ORCPT ); Sun, 1 Nov 2009 20:22:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752924AbZKBBWY (ORCPT ); Sun, 1 Nov 2009 20:22:24 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:36770 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752886AbZKBBWX (ORCPT ); Sun, 1 Nov 2009 20:22:23 -0500 Date: Mon, 2 Nov 2009 12:22:22 +1100 From: Stephen Rothwell To: Takashi Iwai Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Ujfalusi , Mike Rapoport , Tony Lindgren , Subject: linux-next: manual merge of the sound tree with the tree Message-Id: <20091102122222.542dac88.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.3; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Takashi, Today's linux-next merge of the sound tree got a conflict in arch/arm/mach-omap2/board-omap3evm.c between commit fa48a99192e3ee862f6d26c5248347c772b33b84 ("omap3: evm: initialize vmmc and vmmc_aux regulators") from the omap tree and commit f8d9aad96d0d7b57d0bf2e4de21fdda3a42f4449 ("OMAP: Platform support for twl4030_codec MFD") from the sound tree. Just overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/mach-omap2/board-omap3evm.c index 660ef8c,d9a6103..0000000 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@@ -247,8 -211,7 +255,9 @@@ static struct twl4030_platform_data oma .madc = &omap3evm_madc_data, .usb = &omap3evm_usb_data, .gpio = &omap3evm_gpio_data, + .vmmc1 = &omap3evm_vmmc1, + .vsim = &omap3evm_vsim, + .codec = &omap3evm_codec_data, }; static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {