Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756665Ab1CBR6J (ORCPT ); Wed, 2 Mar 2011 12:58:09 -0500 Received: from protonic.xs4all.nl ([213.84.116.84]:21094 "EHLO protonic.prtnl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756065Ab1CBR6H (ORCPT ); Wed, 2 Mar 2011 12:58:07 -0500 Message-ID: <33012.84.56.74.117.1299088565.squirrel@protonic.xs4all.nl> In-Reply-To: <20110302183143.c52ecc00.sfr@canb.auug.org.au> References: <20110301145436.b1ae1923.sfr@canb.auug.org.au> <20110301093528.00184f93@archvile> <20110302183143.c52ecc00.sfr@canb.auug.org.au> Date: Wed, 2 Mar 2011 18:56:05 +0100 (CET) Subject: Re: linux-next: manual merge of the mfd tree with the i.MX tree From: david@protonic.nl To: "Stephen Rothwell" Cc: "David Jander" , "Samuel Ortiz" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Andres Salomon" , "David Jander" , "Sascha Hauer" , Uwe =?iso-8859-1?Q?Kleine-K=C3=B6nig?= User-Agent: SquirrelMail/1.4.10a MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Priority: 3 (Normal) Importance: Normal Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1708 Lines: 48 > Hi David, > > On Tue, 1 Mar 2011 09:35:28 +0100 David Jander > wrote: >> >> Your fix seems correct, although I fear I am too dumb to understand why >> commit >> e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this extra struct >> nesting.... AFAICS gcc will end up doing the same as without the extra >> nest. > > Thanks. > >> Btw, include/linux/mfd/mc13783.h should end up disappearing after you're >> done >> merging... I hope so. > > That file is still included by several others: > > $ git grep -w mfd/mc13783.h > arch/arm/mach-imx/mach-mx27_3ds.c:#include > arch/arm/mach-imx/mach-pcm038.c:#include > arch/arm/mach-mx3/mach-mx31_3ds.c:#include > arch/arm/mach-mx3/mach-mx31lilly.c:#include > arch/arm/mach-mx3/mach-mx31lite.c:#include > arch/arm/mach-mx3/mach-mx31moboard.c:#include > drivers/hwmon/mc13783-adc.c:#include > drivers/input/touchscreen/mc13783_ts.c:#include > drivers/leds/leds-mc13783.c:#include > drivers/mfd/mc13xxx-core.c:#include > drivers/regulator/mc13783-regulator.c:#include These should all be either removed or changed to mc13xxx.h by subsequent patches. Sascha, where is the rest? AFAICR, I already fixed all of these... Best Regards, -- David Jander -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/