From: Stefan Roese <sr@denx.de>
Date: Thu, 18 Jan 2007 09:27:26 +0000 (+0100)
Subject: Merge with /home/stefan/git/u-boot/denx-merge-sr
X-Git-Tag: v1.3.0-rc1~188
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3a83ee3021168ff6fabe396eede56954adb6a3a5;p=u-boot

Merge with /home/stefan/git/u-boot/denx-merge-sr
---

3a83ee3021168ff6fabe396eede56954adb6a3a5
diff --cc MAKEALL
index f727c6906d,7ccaf918c0..b3e16bc6c5
--- a/MAKEALL
+++ b/MAKEALL
@@@ -85,10 -85,10 +85,11 @@@ LIST_4xx="	
  	MIP405		MIP405T		ML2		ml300		\
  	ocotea		OCRTC		ORSG		p3p440		\
  	PCI405		pcs440ep	PIP405		PLU405		\
- 	PMC405		PPChameleonEVB	sbc405		sequoia		\
- 	sequoia_nand	taishan		VOH405		VOM405		\
- 	W7OLMC		W7OLMG		walnut		WUH405		\
- 	XPEDITE1K	yellowstone	yosemite	yucca		\
+ 	PMC405		PPChameleonEVB	sbc405		sc3		\
 -	sequoia		sequoia_nand	VOH405		VOM405		\
 -	W7OLMC		W7OLMG		walnut		WUH405		\
 -	XPEDITE1K	yellowstone	yosemite	yucca		\
++	sequoia		sequoia_nand	taishan		VOH405		\
++	VOM405		W7OLMC		W7OLMG		walnut		\
++	WUH405		XPEDITE1K	yellowstone	yosemite	\
++	yucca								\
  "
  
  #########################################################################