Hi, On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh" <santosh.shilimkar@xxxxxx> wrote: > > > +machine-$(CONFIG_ARCH_OMAP2) := omap2 > > +machine-$(CONFIG_ARCH_OMAP3) := omap2 > > ++machine-$(CONFIG_ARCH_OMAP4) := omap2 > > ++ Is this really ok ? Yeah, this is a diff of a git merge. The ++ just means it was added on neither side of the merge - I modified the change from the omap tree slightly to fit in better with the cleanups from the arm tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpvzqbPp3vdo.pgp
Description: PGP signature
