summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-12-20 17:21:51 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-12-20 17:21:51 +0000
commit7b2f0f5182290ebfe022a12d5fc1b34f9fbc000c (patch)
tree52d8f13c17fdefc57429208a4e1d27ac5473e375 /packages/linux
parent5b6afaaee0d760f91d1bb77fd20bc2e2275c097b (diff)
parent540f6cd2c373497fa790b31f7b2e195adb3cddea (diff)
merge of '0ac48f1fc79ebbccb1647c7d31278fc06fe421ef'
and '96df5dae22f2fb36fef351f22763d1b0524d1dfa'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-rp_2.6.20.bb1
-rw-r--r--packages/linux/linux-rp_2.6.21.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index 60305488ca..9ee189e50a 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -3,6 +3,7 @@ require linux-rp.inc
PR = "r19"
DEFAULT_PREFERENCE_poodle = "-99"
+DEFAULT_PREFERENCE_collie = "1"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index d239b2aa32..e388a0c1a4 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -3,7 +3,7 @@ require linux-rp.inc
PR = "r12"
DEFAULT_PREFERENCE_poodle = "-99"
-DEFAULT_PREFERENCE_collie = "1"
+DEFAULT_PREFERENCE_collie = "-1"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046