--- a/open-src/xserver/xorg/sparc-probe.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/sparc-probe.patch	Mon May 09 14:58:28 2011 -0700
@@ -22,9 +22,10 @@
 
 Allow probing for /dev/fb cards other than the traditional sbus devices.
 
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.c hw/xfree86/common/xf86sbusBus.c
---- hw/xfree86/common/xf86sbusBus.c	2010-06-10 07:07:55.000000000 -0700
-+++ hw/xfree86/common/xf86sbusBus.c	2010-09-03 16:45:12.667073647 -0700
+diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
+index 181c6ab..e9328b3 100644
+--- a/hw/xfree86/common/xf86sbusBus.c
++++ b/hw/xfree86/common/xf86sbusBus.c
 @@ -40,6 +40,10 @@
  #include "xf86sbusBus.h"
  #include "xf86Sbus.h"
@@ -63,9 +64,10 @@
  	xf86ErrorF("\n");
      }
      if (useProm)
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.h hw/xfree86/common/xf86sbusBus.h
---- hw/xfree86/common/xf86sbusBus.h	2010-06-05 18:16:49.000000000 -0700
-+++ hw/xfree86/common/xf86sbusBus.h	2010-09-03 16:45:12.667333987 -0700
+diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h
+index 66a96e3..e27b0e6 100644
+--- a/hw/xfree86/common/xf86sbusBus.h
++++ b/hw/xfree86/common/xf86sbusBus.h
 @@ -39,6 +39,7 @@
  #define SBUS_DEVICE_FFB		0x000b
  #define SBUS_DEVICE_GT		0x000c
@@ -74,10 +76,11 @@
  
  typedef struct sbus_prom_node {
      int			node;
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/os-support/bus/Sbus.c hw/xfree86/os-support/bus/Sbus.c
---- hw/xfree86/os-support/bus/Sbus.c	2010-07-14 13:23:17.000000000 -0700
-+++ hw/xfree86/os-support/bus/Sbus.c	2010-09-03 16:45:12.667732075 -0700
-@@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] =
+diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
+index 7829d80..86c74d6 100644
+--- a/hw/xfree86/os-support/bus/Sbus.c
++++ b/hw/xfree86/os-support/bus/Sbus.c
+@@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] = {
      { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" },
      { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },
      { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" },