[oe-commits] unknown angstrom 2008: fix merge damage (I need more coffee)

[koen commit]

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

Author: koen at openembedded.org
Branch: unknown
Revision: bb1b18fc3fa0562c4c7bd85bb0d9617c62261f2e
ViewMTN: http://monotone.openembedded.org/revision/info/bb1b18fc3fa0562c4c7bd85bb0d9617c62261f2e
Files:
1
conf/distro/angstrom-2008.1.conf
Diffs:

#
# mt diff -rc94ae778508472cc101c537ba6a640d1127221cc -rbb1b18fc3fa0562c4c7bd85bb0d9617c62261f2e
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [bc8500c6fb8975348cebc02efefc14be40ba79b6]
#    to [206a932a3a917837d452a05c20ee8737b1767213]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	bc8500c6fb8975348cebc02efefc14be40ba79b6
+++ conf/distro/angstrom-2008.1.conf	206a932a3a917837d452a05c20ee8737b1767213
@@ -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"