--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-input-mouse/6920647.patch	Sun Feb 14 12:18:08 2010 -0800
@@ -0,0 +1,13 @@
+diff -ur old/src/sun_mouse.c new/src/sun_mouse.c
+--- src/sun_mouse.c	Thu Feb 11 17:09:23 2010
++++ src/sun_mouse.c	Thu Feb 11 17:10:24 2010
+@@ -438,6 +438,9 @@
+     ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
+     int result;
+ 
++    if (!pScr->currentMode)
++	return;
++
+     if ((pVuidMse->absres.width != pScr->currentMode->HDisplay) || 
+ 	(pVuidMse->absres.height != pScr->currentMode->VDisplay))
+     {

--- a/open-src/driver/xf86-input-mouse/Makefile	Thu Feb 11 15:30:42 2010 -0800
+++ b/open-src/driver/xf86-input-mouse/Makefile	Sun Feb 14 12:18:08 2010 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile	1.12	10/01/13 SMI"
+# ident	"@(#)Makefile	1.13	10/02/12 SMI"
 #
 
 # Package name used in tarballs
@@ -42,7 +42,8 @@
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
 	enodev.patch \
-	6892799.patch
+	6892799.patch \
+	6920647.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man