From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Roese <sr@denx.de>
Date: Thu, 23 Sep 2010 08:26:08 +0200
Subject: [U-Boot] [PATCH] ppc4xx: Fix CATcenter build and add it to
	MAKEALL
In-Reply-To: <20100922205203.1FD0AEC2339@gemini.denx.de>
References: <1284363714-11355-1-git-send-email-sr@denx.de>
	<20100922205203.1FD0AEC2339@gemini.denx.de>
Message-ID: <201009230826.08185.sr@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Wolfgang,

On Wednesday 22 September 2010 22:52:03 Wolfgang Denk wrote:
> > +	CATcenter	\
> > 
> >  	CMS700		\
> >  	CPCI2DP		\
> >  	CPCI405		\
> 
> This will result in a merge conflict when pulling into "next", where
> this entry does not exist any more as it gets auto-generated fro
> boards.cfg
> 
> Can we please omit this from this patch?

Yes, will send an updated patch in a few minutes.
 
Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de