[kernel] r15210 - in dists/trunk/linux-2.6/debian/patches: features/sparc series

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 02:28:30 2010
New Revision: 15210

Log:
Fix up features/sparc/video-sunxvr500-intergraph.patch for 2.6.33-rc8

Modified:
   dists/trunk/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch	Fri Feb 19 02:27:34 2010	(r15209)
+++ dists/trunk/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch	Fri Feb 19 02:28:30 2010	(r15210)
@@ -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/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 02:27:34 2010	(r15209)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 02:28:30 2010	(r15210)
@@ -36,7 +36,7 @@
 + bugfix/powerpc/mm-mol.patch
 + bugfix/powerpc/lpar-console.patch
 #+ bugfix/all/wireless-regulatory-default-EU.patch
-#+ features/sparc/video-sunxvr500-intergraph.patch
++ features/sparc/video-sunxvr500-intergraph.patch
 + bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch 
 + debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
 # FIXME: no longer applies