rpms/xorg-x11-drv-i810/devel i810.xinf, 1.13, 1.14 xorg-x11-drv-i810.spec, 1.62, 1.63

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Mon Aug 20 2007 Adam Jackson <ajax at redhat.com> 2.1.1-3
- i810.xinf: Flip everything over to -intel by default now.  Still install
  i810 driver just in case.



Index: i810.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- i810.xinf	6 Jun 2007 18:25:23 -0000	1.13
+++ i810.xinf	20 Aug 2007 20:45:41 -0000	1.14
@@ -1,13 +1,6 @@
-# kudzu effectively does latest match scanning; the list of aliases is built
-# via head insertion, but then scanned from head to tail, so later lines in
-# this file will win.
-#
-# Therefore, we whitelist devices over to the modesetting driver by listing
-# subdevice matches _after_ the general match.
-
 alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* intel	# i815
-alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* i810	# 845G
-alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810	# 865G
+alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* intel	# 845G
+alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* intel	# 865G
 alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* intel	# 915G
 alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* intel	# E7221G ("915G")
 alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* intel	# 915GM
@@ -23,8 +16,8 @@
 alias pcivideo:v00008086d000029D2sv*sd*bc*sc*i* intel	# Q33
 alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel	# 965GM
 alias pcivideo:v00008086d00002A12sv*sd*bc*sc*i* intel	# 965GME
-alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810	# i830
-alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810	# 855GM
+alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* intel	# i830
+alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* intel	# 855GM
 alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* intel	# i810
 alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* intel	# i810 DC100
 alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* intel	# i810E


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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xorg-x11-drv-i810.spec	15 Aug 2007 08:36:00 -0000	1.62
+++ xorg-x11-drv-i810.spec	20 Aug 2007 20:45:41 -0000	1.63
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.1.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -105,6 +105,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Aug 20 2007 Adam Jackson <ajax at redhat.com> 2.1.1-3
+- i810.xinf: Flip everything over to -intel by default now.  Still install
+  i810 driver just in case.
+
 * Wed Aug 15 2007 Dave Airlie <airlied at redhat.com> 2.1.1-2
 - intel-2.1.1-fix-texoffset-start.patch - shouldn't set texoffsetstart when not using EXA