From 34154bfd4716fa98a478a378f17a18293bb3ac4d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 24 Jul 2006 17:45:22 +0000
Subject: [PATCH] linux-openzaurus 2.6.17: Sync with OE .dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@551 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/linux/linux-openzaurus.inc       |  1 +
 meta/packages/linux/linux-openzaurus_2.6.17.bb | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/meta/packages/linux/linux-openzaurus.inc b/meta/packages/linux/linux-openzaurus.inc
index 984002784a..0bb2e3a645 100644
--- a/meta/packages/linux/linux-openzaurus.inc
+++ b/meta/packages/linux/linux-openzaurus.inc
@@ -57,6 +57,7 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi"
 module_autoload_snd-soc-spitz_akita = "snd-soc-spitz"
 module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz"
+module_autoload_snd-soc-poodle_poodle = "snd-soc-poodle"
 
 do_configure() {
 	rm -f ${S}/.config
diff --git a/meta/packages/linux/linux-openzaurus_2.6.17.bb b/meta/packages/linux/linux-openzaurus_2.6.17.bb
index b5380a91bd..038acd451e 100644
--- a/meta/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/meta/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,8 @@
 include linux-openzaurus.inc
 
-PR = "r5"
+PR = "r10"
+
+DEFAULT_PREFERENCE = "-1"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -27,14 +29,14 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \
            file://00-hostap.patch;patch=1;status=merged \
            file://10-pcnet.patch;patch=1;status=merged \
-           ${RPSRC}/asoc-v0.11pre2-oz.patch;patch=1 \
-           ${RPSRC}/asoc_updates-r1.patch;patch=1 \
-           ${RPSRC}/hx2750_base-r25.patch;patch=1 \
+           ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \
+           ${RPSRC}/asoc_fixes2-r0.patch;patch=1 \
+           ${RPSRC}/hx2750_base-r26.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
            ${RPSRC}/pxa_keys-r5.patch;patch=1 \
            ${RPSRC}/tsc2101-r12.patch;patch=1 \
-           ${RPSRC}/hx2750_test1-r3.patch;patch=1 \
+           ${RPSRC}/hx2750_test1-r4.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r5.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
@@ -46,8 +48,9 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
            ${RPSRC}/poodle_pm-r1.patch;patch=1 \
            ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
+           ${RPSRC}/poodle_audio-r1.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://hrw-pcmcia-ids-r2.patch;patch=1 \
+           file://hrw-pcmcia-ids-r3.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \