rpms/kernel/F-8 kernel.spec, 1.316, 1.317 linux-2.6-git-initial-r500-drm.patch, 1.1, 1.2

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	kernel.spec linux-2.6-git-initial-r500-drm.patch 
Log Message:
* Thu Jan 17 2008 Dave Airlie <airlied at redhat.com> 2.6.23.14-108
- update r500 patch to not have duplicate pciids.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- kernel.spec	15 Jan 2008 01:33:29 -0000	1.316
+++ kernel.spec	17 Jan 2008 00:30:29 -0000	1.317
@@ -2047,6 +2047,9 @@
 
 
 %changelog
+* Thu Jan 17 2008 Dave Airlie <airlied at redhat.com> 2.6.23.14-108
+- update r500 patch to not have duplicate pciids.
+
 * Mon Jan 14 2008 Kyle McMartin <kmcmartin at redhat.com>
 - Linux 2.6.23.14
 

linux-2.6-git-initial-r500-drm.patch:

Index: linux-2.6-git-initial-r500-drm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-git-initial-r500-drm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-git-initial-r500-drm.patch	12 Dec 2007 01:24:11 -0000	1.1
+++ linux-2.6-git-initial-r500-drm.patch	17 Jan 2008 00:30:30 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h.r500 linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h
 --- linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h.r500	2007-12-12 11:17:09.000000000 +1000
 +++ linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h	2007-12-12 11:17:39.000000000 +1000
-@@ -139,6 +139,107 @@
+@@ -139,6 +139,101 @@
  	{0x1002, 0x5e4c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x5e4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x5e4f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
@@ -100,12 +100,6 @@
 +	{0x1002, 0x7291, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
 +	{0x1002, 0x7293, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
 +	{0x1002, 0x7297, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-+	{0x1002, 0x7104, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-+	{0x1002, 0x7142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-+	{0x1002, 0x71c7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-+	{0x1002, 0x7183, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-+	{0x1002, 0x7249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-+	{0x1002, 0x7280, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV570|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x7834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0, 0, 0}