From: Koen Kooi <koen@openembedded.org>
Date: Sun, 23 Dec 2007 10:50:30 +0000 (+0000)
Subject: merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
X-Git-Tag: Release-2010-05/1~7838^2~16^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e49ed8da00b7a5d874fd92a806c6b036a726069c;p=openembedded.git

Merge ... '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
     and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'
---

e49ed8da00b7a5d874fd92a806c6b036a726069c
diff --cc packages/linux/linux_2.6.23.bb
index 897694adca,a35799b75a..0b276b4d63
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@@ -5,9 -5,11 +5,12 @@@ DEFAULT_PREFERENCE = "-1
  DEFAULT_PREFERENCE_cm-x270 = "1"
  DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
  DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 +DEFAULT_PREFERENCE_avr32 = "1"
  
- PR = "r6"
+ DEPENDS_append_mpc8313e-rdb = " dtc-native"
+ DEPENDS_append_mpc8323e-rdb = " dtc-native"
+ 
+ PR = "r8"
  
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
  	   file://binutils-buildid-arm.patch;patch=1 \