From f2302d4430e7f3f48308d6a585320fe96af8afbd Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Wed, 6 Aug 2008 14:05:38 +0200
Subject: Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
---
 MAKEALL | 1 -
 1 file changed, 1 deletion(-)

(limited to 'MAKEALL')

diff --git a/MAKEALL b/MAKEALL
index 2948387..ac4195f 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -543,7 +543,6 @@ LIST_at91="		\
 #########################################################################
 
 LIST_pxa="		\
-	adsvix		\
 	cerf250		\
 	cradle		\
 	csb226		\
-- 
cgit v1.1