rpms/xorg-x11-drv-i810/devel intel-stub.c, 1.2, 1.3 xorg-x11-drv-i810.spec, 1.89, 1.90

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4843

Modified Files:
	intel-stub.c xorg-x11-drv-i810.spec 
Log Message:
* Tue Apr 01 2008 Adam Jackson <ajax at redhat.com> 2.2.1-16
- intel-stub.c: Remember the i810 users! (#439845)



Index: intel-stub.c
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-stub.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intel-stub.c	6 Mar 2008 06:51:07 -0000	1.2
+++ intel-stub.c	1 Apr 2008 19:44:55 -0000	1.3
@@ -107,3 +107,30 @@
 	intelStubSetup,
 	NULL
 };
+
+/* And of course, can't forget both i810 users */
+static XF86ModuleVersionInfo i810StubVersRec = {
+	"i810",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XORG_VERSION_CURRENT,
+	INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0, 0, 0, 0}
+};
+
+static pointer
+i810StubSetup(pointer module, pointer options, int *errmaj, int *errmin)
+{
+	return LoadSubModule(module, "intel_master", NULL, NULL, NULL, NULL,
+			     errmaj, errmin);
+}
+
+_X_EXPORT XF86ModuleData i810ModuleData = {
+	&i810StubVersRec,
+	i810StubSetup,
+	NULL
+};


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- xorg-x11-drv-i810.spec	25 Mar 2008 15:03:54 -0000	1.89
+++ xorg-x11-drv-i810.spec	1 Apr 2008 19:44:55 -0000	1.90
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   15%{?dist}
+Release:   16%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -148,6 +148,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Apr 01 2008 Adam Jackson <ajax at redhat.com> 2.2.1-16
+- intel-stub.c: Remember the i810 users! (#439845)
+
 * Tue Mar 25 2008 Jeremy Katz <katzj at redhat.com> - 2.2.1-15
 - Add jbarnes's backlight test patch