rpms/kernel/devel linux-2.6-libata-sata_nv-wildcard-removal.patch, NONE, 1.1 kernel-2.6.spec, 1.3135, 1.3136

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14642

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-sata_nv-wildcard-removal.patch 
Log Message:
* Fri May 04 2007 Dave Jones <davej at redhat.com>
- remove the wildcard from sata_nv driver


linux-2.6-libata-sata_nv-wildcard-removal.patch:

--- NEW FILE linux-2.6-libata-sata_nv-wildcard-removal.patch ---
Date:   Wed, 25 Apr 2007 11:17:21 +0800
To:     <linux-kernel at vger.kernel.org>
From:   "Peer Chen" <pchen at nvidia.com>
Cc:     <akpm at osdl.org>, <jgarzik at pobox.com>, <torvalds at osdl.org>
Subject:  [PATCH] drivers/ata: remove the wildcard from sata_nv driver

Because nvidia SATA controllers onward base on AHCI, so wildcard in
sata_nv driver is unnecessary.
Also the wildcard sometimes cause sata_nv driver to be loaded for AHCI
controllers,which is not as expected.

Signed-off-by: Peer Chen <pchen at nvidia.com>

--- linux-2.6.21.noarch/drivers/ata/sata_nv.c~	2007-05-04 00:06:52.000000000 -0400
+++ linux-2.6.21.noarch/drivers/ata/sata_nv.c	2007-05-04 00:07:00.000000000 -0400
@@ -286,12 +286,6 @@ static const struct pci_device_id nv_pci
 	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },
 	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },
 	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },
-	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
-		PCI_ANY_ID, PCI_ANY_ID,
-		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
-	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
-		PCI_ANY_ID, PCI_ANY_ID,
-		PCI_CLASS_STORAGE_RAID<<8, 0xffff00, GENERIC },
 
 	{ } /* terminate list */
 };


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3135
retrieving revision 1.3136
diff -u -r1.3135 -r1.3136
--- kernel-2.6.spec	4 May 2007 04:06:47 -0000	1.3135
+++ kernel-2.6.spec	4 May 2007 04:08:23 -0000	1.3136
@@ -595,6 +595,7 @@
 Patch2202: linux-2.6-libata-sata_nv-adma.patch
 Patch2204: linux-2.6-ata-quirk.patch
 Patch2205: linux-2.6-libata-sff-pci_iomap-bug.patch
+Patch2206: linux-2.6-libata-sata_nv-wildcard-removal.patch
 
 # Wireless bits
 Patch2300: linux-2.6-wireless.patch
@@ -1347,6 +1348,8 @@
 %patch2204 -p1
 # libata-sff: Undo bug introduced with pci_iomap changes
 %patch2205 -p1
+# remove the wildcard from sata_nv driver
+%patch2206 -p1
 
 # Add critical wireless updates from 2.6.22
 %patch2300 -p1
@@ -2340,6 +2343,9 @@
 
 %changelog
 * Fri May 04 2007 Dave Jones <davej at redhat.com>
+- remove the wildcard from sata_nv driver
+
+* Fri May 04 2007 Dave Jones <davej at redhat.com>
 - Fix 'crash' driver on x86-64.
 
 * Fri May 04 2007 Dave Jones <davej at redhat.com>