* Tue Oct 07 2008 Adam Jackson <ajax@redhat.com> 1.5.1-9

- xserver-1.5.1-xgi.patch: Move XGI cards onto the sis driver. (#453812)

xorg-x11-server.spec

@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -66,6 +66,7 @@ Patch2015:  xserver-1.5.0-comment-out-glxdri2.c
 Patch5001:  xserver-1.4.99-alloca-poison.patch
 # This really could be done prettier.
 Patch5002:  xserver-1.4.99-ssh-isnt-local.patch
+Patch5003:  xserver-1.5.1-xgi.patch
 
 Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
 
@@ -518,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 07 2008 Adam Jackson <ajax@redhat.com> 1.5.1-9
+- xserver-1.5.1-xgi.patch: Move XGI cards onto the sis driver. (#453812)
+
 * Tue Oct 07 2008 Adam Jackson <ajax@redhat.com> 1.5.1-8
 - xserver-1.5.1-int10-leaks.patch: Shut up some useless int10 debugging and
   plug a memory leak.

xserver-1.5.1-xgi.patch

@@ -0,0 +1,26 @@
+From 3be280e47bf259e5ac43350df52ae0829ca0243f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 7 Oct 2008 14:06:21 -0400
+Subject: [PATCH] Shove XGI cards onto the sis driver.
+
+This is wrong for xgixp but whatever like anyone has one of those.
+---
+ hw/xfree86/common/xf86AutoConfig.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 7e5fab4..f110fcd 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+@@ -178,7 +178,7 @@ videoPtrToDriverName(struct pci_device *dev)
+ 		default:
+ 		    return "savage";
+ 	    }
+-	case 0x1039:		    return "sis";
++	case 0x1039: case 0x18ca:   return "sis";
+ 	case 0x126f:		    return "siliconmotion";
+ 	case 0x121a:
+ 	    if (dev->device_id < 0x0003)
+-- 
+1.6.0.1
+