From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 21 Dec 2007 10:19:48 +0000 (+0000)
Subject: merge of 'ac1039a1d9d91d76eddb2acaf45a698b02653e22'
X-Git-Tag: Release-2010-05/1~8122^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3849ba4af7e69f23827c51ff567c375e245161f3;p=openembedded.git

Merge ... 'ac1039a1d9d91d76eddb2acaf45a698b02653e22'
     and 'b6bd29a92b1bcc039254466a0ec064dc61ea94dc'
---

3849ba4af7e69f23827c51ff567c375e245161f3
diff --cc packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 6c3f855df9,44dbbc0786..a7e9b64887
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@@ -2,8 -2,9 +2,9 @@@ require linux.in
  
  # Mark archs/machines that this kernel supports
  DEFAULT_PREFERENCE = "-1"
+ DEFAULT_PREFERENCE_alix = "1"
  
 -PR = "r0"
 +PR = "r2"
  
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
  	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2;patch=1 \