rpms/xorg-x11-server/devel xserver-1.6.0-no-i810.patch, NONE, 1.1 xorg-x11-server.spec, 1.430, 1.431

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32380

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.0-no-i810.patch 
Log Message:
* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 1.6.0-19
- xserver-1.6.0-no-i810.patch: Don't try to load i810.


xserver-1.6.0-no-i810.patch:

--- NEW FILE xserver-1.6.0-no-i810.patch ---
>From be743d919d85a74133d714d4e5137416de02bfb7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 9 Apr 2009 10:38:51 -0400
Subject: [PATCH] config: Remove i810 from the autoload list, we don't ship it.

---
 hw/xfree86/common/xf86AutoConfig.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 853d661..2e69a31 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -175,7 +175,6 @@ videoPtrToDriverList(struct pci_device *dev,
 		break; /* you got powervr in my intel! */
 	    } else {
 		driverList[0] = "intel";
-		driverList[1] = "i810";
 	    }
 	    break;
 	case 0x102b:		    driverList[0] = "mga";	break;
-- 
1.6.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- xorg-x11-server.spec	9 Apr 2009 05:39:34 -0000	1.430
+++ xorg-x11-server.spec	9 Apr 2009 14:45:38 -0000	1.431
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   18%{?dist}
+Release:   19%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -111,6 +111,7 @@
 Patch6027: xserver-1.6.0-displayfd.patch
 
 Patch6028: xserver-1.6.0-restore-zap.patch
+Patch6029: xserver-1.6.0-no-i810.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -528,6 +529,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 1.6.0-19
+- xserver-1.6.0-no-i810.patch: Don't try to load i810.
+
 * Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-18
 - xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.