summaryrefslogtreecommitdiffstats
path: root/MAKEALL
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
committerStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
commitf2302d4430e7f3f48308d6a585320fe96af8afbd (patch)
treeeec529fa883a32b0bd44f65aa46a454dc5c69688 /MAKEALL
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff)
downloadblackbird-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz
blackbird-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'MAKEALL')
-rwxr-xr-xMAKEALL1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAKEALL b/MAKEALL
index 2948387723..ac4195f7d8 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -543,7 +543,6 @@ LIST_at91=" \
#########################################################################
LIST_pxa=" \
- adsvix \
cerf250 \
cradle \
csb226 \
OpenPOWER on IntegriCloud