--- a/open-src/xserver/xorg/sparc-nopciprobe.patch	Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sparc-nopciprobe.patch	Fri May 15 09:36:46 2009 -0700
@@ -29,18 +29,17 @@
 Omit Bus probing on sparc. It is terribly slow and we get the same info thru /dev/fb
 
 *** hw/xfree86/common/xf86Init.c.orig	Thu Dec 18 18:01:47 2008
---- hw/xfree86/common/xf86Init.c	Thu Dec 18 18:02:31 2008
-***************
-*** 734,741 ****
---- 734,744 ----
-      xf86OpenConsole();
-  
-      /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
-+ #if (!defined(__sparc__) && !defined(__sparc))
-      xf86BusProbe();
-+ #endif
-  
-+ 
-      if (xf86DoProbe)
-  	DoProbe();
-  
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c
+--- hw/xfree86/common/xf86Init.c	2009-01-22 20:34:49.294385000 -0800
++++ hw/xfree86/common/xf86Init.c	2009-01-22 20:34:57.326657000 -0800
+@@ -790,7 +790,10 @@ InitOutput(ScreenInfo *pScreenInfo, int 
+     xf86OpenConsole();
+ 
+     /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
++#if (!defined(__sparc__) && !defined(__sparc))
+     xf86BusProbe();
++#endif
++
+ 
+     if (xf86DoProbe)
+ 	DoProbe();