.27 patch

diff --git a/queue-2.6.27/sata_mv-fix-chip-type-for-hightpoint-rocketraid-1740-1742.patch b/queue-2.6.27/sata_mv-fix-chip-type-for-hightpoint-rocketraid-1740-1742.patch
new file mode 100644 (file)
index 0000000..da1c716
--- /dev/null
+++ b/queue-2.6.27/sata_mv-fix-chip-type-for-hightpoint-rocketraid-1740-1742.patch
@@ -0,0 +1,36 @@
+From 4462254ac6be9150aae87d54d388fc348d6fcead Mon Sep 17 00:00:00 2001
+From: Mark Lord <liml@rtr.ca>
+Date: Tue, 27 Jan 2009 16:33:13 -0500
+Subject: sata_mv: Fix chip type for Hightpoint RocketRaid 1740/1742
+
+From: Mark Lord <liml@rtr.ca>
+
+commit 4462254ac6be9150aae87d54d388fc348d6fcead upstream.
+
+Fix chip type for the Highpoint RocketRAID 1740 and 1742 PCI cards.
+These really do have Marvell 6042 chips on them, rather than the 5081 chip.
+
+Confirmed by multiple (two) users (for the 1740), and by examining
+the product photographs from Highpoint's web site.
+
+Signed-off-by: Mark Lord <mlord@pobox.com>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/ata/sata_mv.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/ata/sata_mv.c
++++ b/drivers/ata/sata_mv.c
+@@ -669,8 +669,8 @@ static const struct pci_device_id mv_pci
+       { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
+       /* RocketRAID 1720/174x have different identifiers */
+       { PCI_VDEVICE(TTI, 0x1720), chip_6042 },
+-      { PCI_VDEVICE(TTI, 0x1740), chip_508x },
+-      { PCI_VDEVICE(TTI, 0x1742), chip_508x },
++      { PCI_VDEVICE(TTI, 0x1740), chip_6042 },
++      { PCI_VDEVICE(TTI, 0x1742), chip_6042 },
+ 
+       { PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
+       { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 9dae21b5f72ec9ee5d00c53633943092bd159e0c..9ff6bad1c5229d1656739ad0c1cd8bc3f218d77a 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -37,3 +37,4 @@ newly-inserted-battery-might-differ-from-one-just-removed-so.patch
 acpi-do-not-modify-sci_en-directly.patch
 acpi-suspend-blacklist-hp-xw4600-workstation-for-old-code-ordering.patch
 dlm-initialize-file_lock-struct-in-getlk-before-copying-conflicting-lock.patch
+sata_mv-fix-chip-type-for-hightpoint-rocketraid-1740-1742.patch