On Mon, Aug 2, 2010 at 6:48 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Kevin, > > Today's linux-next merge of the davinci tree got a conflict in > arch/arm/mach-davinci/board-da850-evm.c between commit > 8b24599e72c9aee1ea1187e29cb9c5de9f449cce ("davinci: da850/omap-l138 evm: > account for DEFDCDC{2,3} being tied high") from Linus' tree and commit > ebd1e7808b2fe72d627bdab7bcf61126a831ca5a ("davinci: da850 evm: sparse > cleanup: make file local variables static") from the davinci tree. > > Just context changes. I fixed it up (see below) and can carry the fix > for a while. Thanks for catching this. Before I submit to Linus, I'll merge this with the original tree (Liam's voltage-2.6 tree) so Linus doesn't have to fix this up. Kevin > diff --cc arch/arm/mach-davinci/board-da850-evm.c > index b280efb,f6942dd..0000000 > --- a/arch/arm/mach-davinci/board-da850-evm.c > +++ b/arch/arm/mach-davinci/board-da850-evm.c > @@@ -470,12 -469,7 +470,12 @@@ static struct regulator_consumer_suppl > }, > }; > > +/* We take advantage of the fact that both defdcdc{2,3} are tied high */ > +static struct tps6507x_reg_platform_data tps6507x_platform_data = { > + .defdcdc_default = true, > +}; > + > - struct regulator_init_data tps65070_regulator_data[] = { > + static struct regulator_init_data tps65070_regulator_data[] = { > /* dcdc1 */ > { > .constraints = { > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html