--- a/open-src/xserver/xorg/6839874.patch	Mon Oct 12 11:00:00 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#
-# remove this when xorg 1.7 is integrated
-#
---- ./Xext/shm.c.orig	Wed Sep 30 13:25:01 2009
-+++ ./Xext/shm.c	Wed Sep 30 13:25:41 2009
-@@ -500,7 +500,7 @@
- {
-     PixmapPtr pPixmap;
-   
--    pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
-+    pPixmap = GetScratchPixmapHeader(dst->pScreen, sw, sh, depth,
- 				     BitsPerPixel(depth),
- 				     PixmapBytePad(w, depth),
- 				     data);

--- a/open-src/xserver/xorg/patch-list	Mon Oct 12 11:00:00 2009 -0700
+++ b/open-src/xserver/xorg/patch-list	Tue Oct 13 15:28:04 2009 -0700
@@ -38,5 +38,4 @@
 sparc-initvisuals.patch
 hotkey.patch
 vt.patch
-6839874.patch
 6885229.patch