[kernel] r15691 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Sun May 16 22:14:19 2010
New Revision: 15691

Log:
sis-agp: Remove SIS 760, handled by amd64-agp

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/13

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun May 16 11:41:39 2010	(r15690)
+++ dists/sid/linux-2.6/debian/changelog	Sun May 16 22:14:19 2010	(r15691)
@@ -39,6 +39,7 @@
   * libata: Disable HPA if it is only enabled after suspend
   * V4L/DVB: budget: Select correct frontend drivers (Closes: #575223)
   * 3c503: Fix IRQ probing (Closes: #566522)
+  * sis-agp: Remove SIS 760, handled by amd64-agp
 
   [ Aurelien Jarno ]
   * mips/swarm: fix boot from IDE based media (Sebastian Andrzej Siewior)

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch	Sun May 16 22:14:19 2010	(r15691)
@@ -0,0 +1,37 @@
+Subject: [PATCH 1/2] sis-agp: Remove SIS 760, handled by amd64-agp
+From: Ben Hutchings <ben at decadent.org.uk>
+To: David Airlie <airlied at linux.ie>
+Cc: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>, LKML <linux-kernel at vger.kernel.org>
+Date: Wed, 24 Mar 2010 03:33:48 +0000
+
+SIS 760 is listed in the device tables for both amd64-agp and sis-agp.
+amd64-agp is apparently preferable since it has workarounds for some
+BIOS misconfigurations that sis-agp doesn't handle.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/char/agp/sis-agp.c |    8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
+index 6c3837a..95fdd4d 100644
+--- a/drivers/char/agp/sis-agp.c
++++ b/drivers/char/agp/sis-agp.c
+@@ -415,14 +415,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 	},
+-	{
+-		.class		= (PCI_CLASS_BRIDGE_HOST << 8),
+-		.class_mask	= ~0,
+-		.vendor		= PCI_VENDOR_ID_SI,
+-		.device		= PCI_DEVICE_ID_SI_760,
+-		.subvendor	= PCI_ANY_ID,
+-		.subdevice	= PCI_ANY_ID,
+-	},
+ 	{ }
+ };
+ 
+-- 
+1.7.0
+

Modified: dists/sid/linux-2.6/debian/patches/series/13
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/13	Sun May 16 11:41:39 2010	(r15690)
+++ dists/sid/linux-2.6/debian/patches/series/13	Sun May 16 22:14:19 2010	(r15691)
@@ -33,3 +33,4 @@
 + bugfix/all/drm-edid-Fix-1024x768 at 85Hz.patch
 + bugfix/all/3c503-Fix-IRQ-probing.patch
 + features/all/input-add-support-of-synaptics-clickpad-device.patch
++ bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch