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

[Bastian Blank]

Author: waldi
Date: Mon Dec 15 11:51:07 2008
New Revision: 12507

Log:
[sparc] Support Intergraph graphics chips.

* debian/changelog: Update.
* debian/patches/features/sparc/video-sunxvr500-intergraph.patch: Add.
* debian/patches/series/12: Add new patch.


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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 15 11:51:07 2008
@@ -13,6 +13,7 @@
   * [openvz, vserver] Fix descriptions.
   * [sparc] Enable Sun Logical Domains support. (closes: #501684)
   * Fix coexistence of pata_marvell and ahci. (closes: #507432)
+  * [sparc] Support Intergraph graphics chips. (closes: #508108)
 
  -- dann frazier <dannf at debian.org>  Fri, 05 Dec 2008 23:12:07 -0700
 

Added: dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch	Mon Dec 15 11:51:07 2008
@@ -0,0 +1,23 @@
+diff -aur a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
+--- a/drivers/video/sunxvr500.c	2008-11-20 18:02:37.000000000 -0500
++++ b/drivers/video/sunxvr500.c	2008-12-01 15:43:04.000000000 -0500
+@@ -396,6 +396,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(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/12
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/12	(original)
+++ dists/sid/linux-2.6/debian/patches/series/12	Mon Dec 15 11:51:07 2008
@@ -2,3 +2,4 @@
 + bugfix/all/inotify-watch-removal-umount-races.patch
 + bugfix/all/atm-duplicate-listen-on-socket-corrupts-the-vcc-table.patch
 + bugfix/all/ata-pata_marvell-vs-ahci.patch
++ features/sparc/video-sunxvr500-intergraph.patch