From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 6 Jun 2005 14:51:16 +0000 (+0000)
Subject: Hand merge.
X-Git-Tag: Release-2010-05/1~13998
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d990850933c71be671cdf417a75a96cc2c31803;p=openembedded.git

Hand merge.

BKrev: 42a462e483oHj6zB33n2ZDni_jzkxQ
---

diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-20050603.bb
index 43bf828203..2efa14186e 100644
--- a/packages/gcc/gcc_csl-arm-20050603.bb
+++ b/packages/gcc/gcc_csl-arm-20050603.bb
@@ -11,5 +11,3 @@ CVSDATE = "20050603"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 
 DEFAULT_PREFERENCE_arm = "1"
-
-DEFAULT_PREFERENCE_nslu2 = "-1"