[PATCH 2.6.14-rc3] Fix sata_nv handling of NVIDIA MCP51/55

[PATCH 2.6.14-rc3] Fix sata_nv handling of NVIDIA MCP51/55

[Andy Currid]

Patch to fix sata_nv handling of NVIDIA MCP51/55


Signed-off-by: Andy Currid <acurrid@nvidia.com>

--- linux-2.6.14-rc3/drivers/scsi/sata_nv.c	2003-01-01
18:08:23.000000000 -0800
+++ linux-2.6.14-rc3devel/drivers/scsi/sata_nv.c	2003-01-01
18:19:34.000000000 -0800
@@ -29,6 +29,8 @@
  *  NV-specific details such as register offsets, SATA phy location,
  *  hotplug info, etc.
  *
+ *  0.09
+ *     - Fixed bug introduced by 0.08's MCP51 and MCP55 support.
  *
  *  0.08
  *     - Added support for MCP51 and MCP55.
@@ -132,9 +134,7 @@ enum nv_host_type
 	GENERIC,
 	NFORCE2,
 	NFORCE3,
-	CK804,
-	MCP51,
-	MCP55
+	CK804
 };
 
 static struct pci_device_id nv_pci_tbl[] = {
@@ -153,13 +153,13 @@ static struct pci_device_id nv_pci_tbl[]
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 },
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 },
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
 		PCI_ANY_ID, PCI_ANY_ID,
 		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },

Re: [PATCH 2.6.14-rc3] Fix sata_nv handling of NVIDIA MCP51/55

[Jeff Garzik]

Andy Currid wrote:
> Patch to fix sata_nv handling of NVIDIA MCP51/55
> 
> 
> Signed-off-by: Andy Currid <acurrid@nvidia.com>
> 
> --- linux-2.6.14-rc3/drivers/scsi/sata_nv.c	2003-01-01
> 18:08:23.000000000 -0800
> +++ linux-2.6.14-rc3devel/drivers/scsi/sata_nv.c	2003-01-01
> 18:19:34.000000000 -0800

Applied, after I manually fixed the wrapped lines above.

	Jeff