rpms/kernel/F-8 kernel.spec, 1.511, 1.512 nouveau-drm.patch, 1.11, 1.12

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18822

Modified Files:
	kernel.spec nouveau-drm.patch 
Log Message:
* Sat Aug 09 2008 Dave Airlie <airlied at redhat.com>
- make nouveau drm apply again



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- kernel.spec	8 Aug 2008 18:56:00 -0000	1.511
+++ kernel.spec	9 Aug 2008 07:07:04 -0000	1.512
@@ -973,7 +973,7 @@
 #ALSA
 
 # Nouveau DRM + drm fixes
-#ApplyPatch nouveau-drm.patch
+ApplyPatch nouveau-drm.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1761,6 +1761,9 @@
 
 
 %changelog
+* Sat Aug 09 2008 Dave Airlie <airlied at redhat.com>
+- make nouveau drm apply again
+
 * Fri Aug 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.2-1
 - Linux 2.6.26.2
 

nouveau-drm.patch:

Index: nouveau-drm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/nouveau-drm.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nouveau-drm.patch	22 May 2008 02:31:54 -0000	1.11
+++ nouveau-drm.patch	9 Aug 2008 07:07:04 -0000	1.12
@@ -201,8 +201,8 @@
 --- a/drivers/char/drm/drm_pciids.h
 +++ b/drivers/char/drm/drm_pciids.h
 @@ -412,3 +412,267 @@
- 	{0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
- 	{0x8086, 0x2a42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ 	{0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ 	{0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
  	{0, 0, 0}
 +
 +