--- a/open-src/xserver/xorg/6721634.patch	Wed Mar 09 16:02:37 2011 -0800
+++ b/open-src/xserver/xorg/6721634.patch	Mon Mar 14 15:37:30 2011 -0700
@@ -18,9 +18,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
---- hw/xfree86/common/xf86AutoConfig.c	2009-10-08 21:08:28.000000000 -0700
-+++ hw/xfree86/common/xf86AutoConfig.c	2009-11-03 22:29:14.137406985 -0800
+diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
+--- hw/xfree86/common/xf86AutoConfig.c	2010-06-10 07:07:55.000000000 -0700
++++ hw/xfree86/common/xf86AutoConfig.c	2010-09-03 16:45:29.769441097 -0700
 @@ -59,6 +59,18 @@
  	"\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \
  	"\tDriver\t\"%s\"\n"
@@ -54,7 +54,7 @@
  #define BUILTIN_SCREEN_NAME \
  	"\"Builtin Default %s Screen %d\""
  
-@@ -247,6 +266,14 @@ xf86AutoConfig(void)
+@@ -151,6 +170,14 @@ xf86AutoConfig(void)
      listPossibleVideoDrivers(deviceList, 20);
  
      for (p = deviceList; *p; p++) {