18 files changed, 3 insertions, 5 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch
index 4414b2119..4414b2119 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita b/meta/packages/linux/linux-rp-2.6.22/defconfig-akita
index 748ab41d2..748ab41d2 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.22/defconfig-bootcdx86
index d439d8981..d439d8981 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.22/defconfig-c7x0
index e8efdd4de..e8efdd4de 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie b/meta/packages/linux/linux-rp-2.6.22/defconfig-collie
index 422ed94df..422ed94df 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.22/defconfig-hx2000
index 2a67a2d04..2a67a2d04 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.22/defconfig-poodle
index 13616c08f..13616c08f 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemuarm
index f70b6db7c..f70b6db7c 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemux86
index 08e0a0c6c..08e0a0c6c 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.22/defconfig-spitz
index 11cad5c91..11cad5c91 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.22/defconfig-tosa
index 4360f7a17..4360f7a17 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-tosa
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch b/meta/packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch
index 641fd19e5..641fd19e5 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch
index bf20f46a0..bf20f46a0 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba146..b513ba146 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch b/meta/packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch
index 6312efe46..6312efe46 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch b/meta/packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
index b1b0fc354..b1b0fc354 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-rp-2.6.22/wm97xx-lcdnoise-r0.patch
index 191de3af2..191de3af2 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/wm97xx-lcdnoise-r0.patch
diff --git a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb b/meta/packages/linux/linux-rp_2.6.22.bb
index 12881c869..5f8701a64 100644
--- a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
+++ b/meta/packages/linux/linux-rp_2.6.22.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r2"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,8 +15,7 @@ DEFAULT_PREFERENCE = "-1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc7.bz2;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            ${RPSRC}/lzo_kernel-r3.patch;patch=1 \
            ${RPSRC}/lzo_jffs2-r2.patch;patch=1 \
            ${RPSRC}/lzo_crypto-r2.patch;patch=1 \
@@ -40,7 +39,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
            ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \
-           ${RPSRC}/pxa_cken_fixes-r0.patch;patch=1 \
            file://hostap-monitor-mode.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
@@ -110,4 +108,4 @@ SRC_URI_append_tosa = "\
            file://wm97xx-lcdnoise-r0.patch;patch=1 "
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
-S = "${WORKDIR}/linux-2.6.21"
+S = "${WORKDIR}/linux-2.6.22"