merge of '1944e442d97092991784475bf4b8980e60c5c3fc'

     and 'c6043a6be9941ce6182b30748b51b8f191e04bc8'

4 files changed, 14 insertions, 5 deletions

diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 321d24a035..6ee29d3d9a 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "644"
+IXP4XX_KERNEL_SVN_REV = "647"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/linux-efika/defconfig b/packages/linux/linux-efika/defconfig
index 41529d9678..05a06b6c5e 100644
--- a/packages/linux/linux-efika/defconfig
+++ b/packages/linux/linux-efika/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.19-rc6
-# Mon Nov 27 17:09:56 2006
+# Sun Dec 31 01:46:08 2006
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -1413,6 +1413,11 @@ CONFIG_SND_VIA82XX_MODEM=m
 #
 
 #
+# ALSA PPC devices
+#
+CONFIG_SND_PPC_MPC52xx_AC97=m
+
+#
 # USB devices
 #
 CONFIG_SND_USB_AUDIO=m
diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index ff9b958eb3..679bd667d5 100644
--- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -6,8 +6,11 @@ PR = "r1"
 COMPATIBLE_MACHINE = "efika"
 
 SRC_URI = "http://www.efika.de/download/linux-2.6.19-rc6_efika.tgz \
+           http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
+           http://www.246tnt.com/files/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \
            file://defconfig \
 		   "
+#           http://lkml.org/lkml/2006/11/29/335;patch=1 \
 
 S = "${WORKDIR}/linux-2.6.19-rc6_efika"
 
diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index 4620537aa1..3df216d616 100644
--- a/packages/linux/linux-rp_2.6.19+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -15,9 +15,10 @@ DEFAULT_PREFERENCE = "-1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc2 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1;status=merged \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13pre1.patch;patch=1;status=merged \
+           ${RPSRC}/asoc_13pre1_fix-r0.patch;patch=1 \
            ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1;status=merged \
-           ${RPSRC}/backlight_parameter_fix-r0.patch;patch=1;status=pending \
+           ${RPSRC}/backlight_parameter_fix-r1.patch;patch=1;status=pending \
            ${RPSRC}/hx2750_base-r28.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r8.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -31,7 +32,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \
-           ${DOSRC}/kexec-arm-r4.patch;patch=1 \
+           ${RPSRC}/kexec-arm-r4.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \