From 6998bbabfb1a5b989b3d0a405ad68fc731fd615b Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@fedoraproject.org>
Date: Jul 28 2009 23:02:45 +0000
Subject: * Wed Jul 29 2009 Ben Skeggs <bskeggs@redhat.com> 1.6.2-3

- Fix nouveau autoconfig patch (rh#512851)

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 0302d38..bc82578 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -532,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 29 2009 Ben Skeggs <bskeggs@redhat.com> 1.6.2-3
+- Fix nouveau autoconfig patch (rh#512851)
+
 * Fri Jul 10 2009 Lubomir Rintel <lkundrak@v3.sk> 1.6.2-2
 - Add vboxvideo driver to the autodetection routine
 
diff --git a/xserver-1.6.1-nouveau.patch b/xserver-1.6.1-nouveau.patch
index 4990601..3b1f103 100644
--- a/xserver-1.6.1-nouveau.patch
+++ b/xserver-1.6.1-nouveau.patch
@@ -78,7 +78,7 @@ diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConf
 index 19c06c8..e40551e 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -181,7 +181,31 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -181,7 +181,32 @@ videoPtrToDriverList(struct pci_device *dev,
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
  	case 0x105d:		    driverList[0] = "i128";	break;
@@ -108,6 +108,7 @@ index 19c06c8..e40551e 100644
 +		}
 +		break;
 +	    }
++	    break;
  	case 0x1163:		    driverList[0] = "rendition"; break;
  	case 0x5333:
  	    switch (dev->device_id)