linux-oz-2.6: Update akita patch to that pushed into into mainline. Add correct borzo...

diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index cb43f5a..f775ca1 100644 (file)
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -21,8 +21,8 @@ COMPATIBLE_HOST = "arm.*-linux"
 
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
 CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
-CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
 CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw "
+CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw "
 
 ##############################################################
 # Configure memory/ramdisk split for collie

diff --git a/packages/linux/linux-openzaurus_2.6.14-git3.bb b/packages/linux/linux-openzaurus_2.6.14-git3.bb
index c5552f2..d772f15 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.14-git3.bb
+++ b/packages/linux/linux-openzaurus_2.6.14-git3.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r4"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -25,7 +25,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \
            ${RPSRC}/sharpsl_pm-r12.patch;patch=1 \
            ${RPSRC}/corgi_pm-r5.patch;patch=1 \
            ${RPSRC}/spitz_pm-r8.patch;patch=1 \
-           ${RPSRC}/spitz_base_extras-r11.patch;patch=1 \
+           ${RPSRC}/spitz_base_extras-r12.patch;patch=1 \
            ${RPSRC}/max7310-r1.patch;patch=1 \
            ${RPSRC}/enable_iwmmxt-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r3.patch;patch=1 \