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 5d9f761a95020cc4302ce5a630ad709d91ffbbd5..86c6c998d03e21a5b5044e510076ae69a00f0f69 100644 (file)
--- 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"