From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754697Ab0HQCVl (ORCPT ); Mon, 16 Aug 2010 22:21:41 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:52337 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753750Ab0HQCVj (ORCPT ); Mon, 16 Aug 2010 22:21:39 -0400 Date: Tue, 17 Aug 2010 12:21:37 +1000 From: Stephen Rothwell To: Mark Brown , Liam Girdwood Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Dooks Subject: linux-next: manual merge of the sound-asoc tree with the samsung tree Message-Id: <20100817122137.aa6f269e.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; 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 all, Today's linux-next merge of the sound-asoc tree got a conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c between commit 96e9d908a7b5b5be774ba26aca0d6633e7c97f63 ("ARM: SMDK6410: Register AC97 controller") from the samsung tree and commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ("ASoC: multi-component - ASoC Multi-Component Support") from the sound-asoc tree. Just overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Stephen Rothwell diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c index c0f46e0,ecbddd3..0000000 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@@ -284,7 -283,7 +284,8 @@@ static struct platform_device *smdk6410 &s3c_device_fb, &s3c_device_ohci, &s3c_device_usb_hsotg, + &s3c64xx_device_ac97, + &s3c_device_pcm, &s3c64xx_device_iisv4, &samsung_device_keypad,