[kernel] r15211 - in dists/sid/linux-2.6/debian: . patches/features/sparc patches/series

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 02:42:12 2010
New Revision: 15211

Log:
[sparc] sunxvr500: Support Intergraph graphics chips again (Closes: #508108)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch
   dists/sid/linux-2.6/debian/patches/series/9

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Feb 19 02:28:30 2010	(r15210)
+++ dists/sid/linux-2.6/debian/changelog	Fri Feb 19 02:42:12 2010	(r15211)
@@ -6,6 +6,8 @@
   * Ignore failure of lsusb when gathering information for bug reports
     (Closes: #569725)
   * macvlan: Add bridge, VEPA and private modes (Closes: #568756)
+  * [sparc] sunxvr500: Support Intergraph graphics chips again
+    (Closes: #508108)
 
   [ maximilian attems]
   * Postinst don't refercence k-p related manpage. (closes: #542208)

Modified: dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch	Fri Feb 19 02:28:30 2010	(r15210)
+++ dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch	Fri Feb 19 02:42:12 2010	(r15211)
@@ -5,19 +5,7 @@
  
  static struct pci_device_id e3d_pci_table[] = {
  	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a0),	},
-+	{	PCI_DEVICE(PCI_VENDOR_ID_IGRAPH, 0x7a0),	},
++	{	PCI_DEVICE(0x1091, 0x7a0),			},
  	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a2),	},
  	{	.vendor = PCI_VENDOR_ID_3DLABS,
  		.device = PCI_ANY_ID,
-diff -aur a/include/linux/pci_ids.h b/include/linux/pci_ids.h
---- a/include/linux/pci_ids.h	2008-11-20 18:02:37.000000000 -0500
-+++ b/include/linux/pci_ids.h	2008-12-01 15:43:04.000000000 -0500
-@@ -930,6 +930,8 @@
- #define PCI_DEVICE_ID_SUN_TOMATILLO	0xa801
- #define PCI_DEVICE_ID_SUN_CASSINI	0xabba
- 
-+#define PCI_VENDOR_ID_IGRAPH		0x1091
-+
- #define PCI_VENDOR_ID_CMD		0x1095
- #define PCI_DEVICE_ID_CMD_643		0x0643
- #define PCI_DEVICE_ID_CMD_646		0x0646

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	Fri Feb 19 02:28:30 2010	(r15210)
+++ dists/sid/linux-2.6/debian/patches/series/9	Fri Feb 19 02:42:12 2010	(r15211)
@@ -8,3 +8,4 @@
 + features/all/hwmon-Add-driver-for-VIA-CPU-core-temperature.patch
 + features/all/wireless-report-reasonable-bitrate-for-MCS-rates-th.patch
 + bugfix/all/efifb_fix_v2.patch
++ features/sparc/video-sunxvr500-intergraph.patch