merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Dec 2007 10:50:30 +0000 (10:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 23 Dec 2007 10:50:30 +0000 (10:50 +0000)
     and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'

1  2 
conf/distro/include/angstrom.inc
packages/linux/linux.inc
packages/linux/linux_2.6.23.bb

Simple merge
Simple merge
@@@ -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 \