25 files changed, 18 insertions, 18 deletions
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/.mtn2git_empty b/packages/linux/linux-rp-2.6.24/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.24/.mtn2git_empty
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/binutils-buildid-arm.patch b/packages/linux/linux-rp-2.6.24/binutils-buildid-arm.patch
index 68e35e89e1..68e35e89e1 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/binutils-buildid-arm.patch
+++ b/packages/linux/linux-rp-2.6.24/binutils-buildid-arm.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-prevent-oops-HACK.patch b/packages/linux/linux-rp-2.6.24/connectplus-prevent-oops-HACK.patch
index b5439c62e7..b5439c62e7 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-prevent-oops-HACK.patch
+++ b/packages/linux/linux-rp-2.6.24/connectplus-prevent-oops-HACK.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.24/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.24/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita b/packages/linux/linux-rp-2.6.24/defconfig-akita
index 381fafbb25..5e4560c39d 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.24/defconfig-akita
@@ -1031,7 +1031,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86 b/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86
index 0d7c289f37..fda13665cd 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86
+++ b/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86
@@ -1277,7 +1277,7 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0 b/packages/linux/linux-rp-2.6.24/defconfig-c7x0
index a77f3f519e..a47e843a2e 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.24/defconfig-c7x0
@@ -1044,7 +1044,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie
index 07258b44ed..d4b813e2cf 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.24/defconfig-collie
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24-rc8
-# Mon Jan 21 21:35:18 2008
+# Mon Jan 21 22:14:20 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -282,7 +282,7 @@ CONFIG_PM=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_UP_POSSIBLE=y
 CONFIG_SUSPEND=y
-CONFIG_APM_EMULATION=y
+CONFIG_APM_EMULATION=m
 
 #
 # Networking
@@ -959,7 +959,7 @@ CONFIG_DAB=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
@@ -969,7 +969,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal b/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal
index 4be1331776..f121ddea90 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
+++ b/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal
@@ -828,7 +828,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000 b/packages/linux/linux-rp-2.6.24/defconfig-hx2000
index f9317ba2a2..41eee3854a 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.24/defconfig-hx2000
@@ -1030,7 +1030,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle b/packages/linux/linux-rp-2.6.24/defconfig-poodle
index 6953b2af5b..ecffc3aba6 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.24/defconfig-poodle
@@ -1049,7 +1049,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm b/packages/linux/linux-rp-2.6.24/defconfig-qemuarm
index bf96d2aff7..d2b8265214 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.24/defconfig-qemuarm
@@ -984,7 +984,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86 b/packages/linux/linux-rp-2.6.24/defconfig-qemux86
index 39e236ae8b..e0094fec3c 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.24/defconfig-qemux86
@@ -1276,7 +1276,7 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz b/packages/linux/linux-rp-2.6.24/defconfig-spitz
index cc9f6e6988..d0226301f7 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.24/defconfig-spitz
@@ -1031,7 +1031,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite b/packages/linux/linux-rp-2.6.24/defconfig-zylonite
index c813b1a0f5..0cf0b23db5 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite
+++ b/packages/linux/linux-rp-2.6.24/defconfig-zylonite
@@ -1045,7 +1045,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/hostap-monitor-mode.patch b/packages/linux/linux-rp-2.6.24/hostap-monitor-mode.patch
index 641fd19e50..641fd19e50 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/hostap-monitor-mode.patch
+++ b/packages/linux/linux-rp-2.6.24/hostap-monitor-mode.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch b/packages/linux/linux-rp-2.6.24/htcuni-acx.patch
index 1ccebddc8d..1ccebddc8d 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch
+++ b/packages/linux/linux-rp-2.6.24/htcuni-acx.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch b/packages/linux/linux-rp-2.6.24/htcuni.patch
index f462650566..f462650566 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch
+++ b/packages/linux/linux-rp-2.6.24/htcuni.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.24/pxa-serial-hack.patch
index bf20f46a05..bf20f46a05 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.24/pxa-serial-hack.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/pxa_fb_overlay.patch b/packages/linux/linux-rp-2.6.24/pxa_fb_overlay.patch
index 49c59b3275..49c59b3275 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/pxa_fb_overlay.patch
+++ b/packages/linux/linux-rp-2.6.24/pxa_fb_overlay.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba1466..b513ba1466 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/squashfs3.3.patch b/packages/linux/linux-rp-2.6.24/squashfs3.3.patch
index cb9a5c49e4..cb9a5c49e4 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/squashfs3.3.patch
+++ b/packages/linux/linux-rp-2.6.24/squashfs3.3.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/versatile-armv6.patch b/packages/linux/linux-rp-2.6.24/versatile-armv6.patch
index e2d0060ac3..e2d0060ac3 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/versatile-armv6.patch
+++ b/packages/linux/linux-rp-2.6.24/versatile-armv6.patch
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/zylonite-boot.patch b/packages/linux/linux-rp-2.6.24/zylonite-boot.patch
index f41928eca5..f41928eca5 100644
--- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/zylonite-boot.patch
+++ b/packages/linux/linux-rp-2.6.24/zylonite-boot.patch
diff --git a/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb b/packages/linux/linux-rp_2.6.24.bb
index ec06f202f3..68fad7df62 100644
--- a/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r2"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
@@ -16,11 +16,11 @@ DEFAULT_PREFERENCE_collie = "1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
-           ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/patch-2.6.24-rc8.bz2;patch=1 \
+SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            ${RPSRC}/export_atags-r2.patch;patch=1;status=pending \
            ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending \
            ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1;status=pending \
+           ${RPSRC}/allow_disable_deferrred-r0.patch;patch=1 \
            ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r33.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r9.patch;patch=1 \
@@ -143,4 +143,4 @@ SRC_URI_append_zylonite ="\
 	file://zylonite-boot.patch;patch=1 \
 	"
 
-S = "${WORKDIR}/linux-2.6.23"
+S = "${WORKDIR}/linux-2.6.24"