29 files changed, 2 insertions, 6 deletions

diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/arm_pxa_20070923.patch b/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
index 1fba1a3b03..1fba1a3b03 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/arm_pxa_20070923.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/binutils-buildid-arm.patch b/meta/packages/linux/linux-rp-2.6.23/binutils-buildid-arm.patch
index 68e35e89e1..68e35e89e1 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/binutils-buildid-arm.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/binutils-buildid-arm.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/connectplus-remove-ide-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-akita b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita
index edeaa414db..edeaa414db 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
index 833f72ac9e..833f72ac9e 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-bootcdx86
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0
index c644187e96..c644187e96 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-collie b/meta/packages/linux/linux-rp-2.6.23/defconfig-collie
index 49d9596b92..49d9596b92 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
index 2b02621499..2b02621499 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000
index ee05db4e5a..ee05db4e5a 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
index 387b5e9bff..387b5e9bff 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm
index 35cf3f5b17..35cf3f5b17 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
index e9eb83e2dd..e9eb83e2dd 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
index 8e044e6a14..8e044e6a14 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa
index 74fc076608..74fc076608 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-tosa
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
index 0321704a1f..0321704a1f 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-zylonite
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/hostap-monitor-mode.patch b/meta/packages/linux/linux-rp-2.6.23/hostap-monitor-mode.patch
index 641fd19e50..641fd19e50 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/hostap-monitor-mode.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni-acx.patch b/meta/packages/linux/linux-rp-2.6.23/htcuni-acx.patch
index 769674c935..769674c935 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni-acx.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/htcuni-acx.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni.patch b/meta/packages/linux/linux-rp-2.6.23/htcuni.patch
index 4d746749c5..4d746749c5 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/htcuni.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/irq-gpio-offby1.patch b/meta/packages/linux/linux-rp-2.6.23/irq-gpio-offby1.patch
index fcf5bb3ae0..fcf5bb3ae0 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/irq-gpio-offby1.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/irq-gpio-offby1.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pda-power.patch b/meta/packages/linux/linux-rp-2.6.23/pda-power.patch
index face2f4ef2..face2f4ef2 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pda-power.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/pda-power.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.23/pxa-serial-hack.patch
index bf20f46a05..bf20f46a05 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pxa-serial-hack.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pxa_fb_overlay.patch b/meta/packages/linux/linux-rp-2.6.23/pxa_fb_overlay.patch
index 49c59b3275..49c59b3275 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pxa_fb_overlay.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/pxa_fb_overlay.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba1466..b513ba1466 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/squashfs3.0-2.6.15.patch b/meta/packages/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch
index a210afcaf8..a210afcaf8 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/squashfs3.0-2.6.15.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/uvesafb-0.1-rc3-2.6.22.patch b/meta/packages/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch
index 711375114f..711375114f 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/uvesafb-0.1-rc3-2.6.22.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch b/meta/packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch
index 5a51d1c3f5..5a51d1c3f5 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-rp-2.6.23/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/wm97xx-lcdnoise-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/wm97xx-lcdnoise-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/zylonite-boot.patch b/meta/packages/linux/linux-rp-2.6.23/zylonite-boot.patch
index f41928eca5..f41928eca5 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/zylonite-boot.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/zylonite-boot.patch
diff --git a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb b/meta/packages/linux/linux-rp_2.6.23.bb
index 5dbcca676c..c50c553056 100644
--- a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.23.bb
@@ -1,7 +1,5 @@
 require linux-rp.inc
 
-PR = "r8"
-
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_htcuniversal = "1"
 DEFAULT_PREFERENCE_zylonite = "1"
@@ -17,8 +15,7 @@ DEFAULT_PREFERENCE_zylonite = "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.22.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.23-rc4.bz2;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
            ${RPSRC}/lzo_jffs2-r3.patch;patch=1 \
            ${RPSRC}/lzo_crypto-r2.patch;patch=1 \
            ${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1 \
@@ -54,7 +51,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            file://uvesafb-0.1-rc3-2.6.22.patch;patch=1;status=external \
            file://htcuni.patch;patch=1 \
            file://binutils-buildid-arm.patch;patch=1 \
-           file://vt_ioctl_race.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \
@@ -128,4 +124,4 @@ SRC_URI_append_zylonite ="\
         file://zylonite-boot.patch;patch=1 \
         "
 
-S = "${WORKDIR}/linux-2.6.22"
+S = "${WORKDIR}/linux-2.6.23"