From: Koen Kooi <koen@openembedded.org>
Date: Tue, 11 Dec 2007 09:46:04 +0000 (+0000)
Subject: angstrom 2008: fix merge damage (I need more coffee)
X-Git-Tag: Release-2010-05/1~7838^2~16^2~2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9030208546561970a18f0eb4be401b4d837aa310;p=openembedded.git

angstrom 2008: fix merge damage (I need more coffee)
---

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 5d9f761a95..86c6c998d0 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -12,11 +12,6 @@
 #    http://bugs.openembedded.org
 # In doubt, use DISTRO="angstrom-2007.1"
 
-#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh16"
-
-require conf/distro/angstrom-2007.1.conf
-
 #DISTRO_VERSION = "2008.1"
 DISTRO_VERSION = "2008.1-test-${DATE}"
 DISTRO_REVISION = "1"