[BK PATCHES] 2.6.x libata update

[Jeff Garzik <jgarzik@pobox.com>]

[-- Attachment #1: Type: text/plain, Size: 51 bytes --]

update driver blacklist, and add a couple PCI IDs.

[-- Attachment #2: changelog.txt --]
[-- Type: text/plain, Size: 649 bytes --]

Please do a

	bk pull bk://gkernel.bkbits.net/libata-2.6

This will update the following files:

 drivers/scsi/ahci.c     |    4 ++++
 drivers/scsi/sata_sil.c |    1 +
 2 files changed, 5 insertions(+)

through these ChangeSets:

<jason.d.gaston@intel.com> (05/01/27 1.2142)
   [PATCH] SATA AHCI support for Intel ICH7R
   
   This patch adds the Intel ICH7R DID's to the ahci.c SATA AHCI driver
   for ICH7R SATA support.
   
   Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
   Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

<haroldo.gamal@infolink.com.br> (05/01/27 1.2141)
   [libata sata_sil] add another Seagate driver to blacklist


[-- Attachment #3: patch --]
[-- Type: text/plain, Size: 1017 bytes --]

diff -Nru a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
--- a/drivers/scsi/ahci.c	2005-01-27 18:42:36 -05:00
+++ b/drivers/scsi/ahci.c	2005-01-27 18:42:36 -05:00
@@ -246,6 +246,10 @@
 	  board_ahci }, /* ICH7 */
 	{ PCI_VENDOR_ID_INTEL, 0x27c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* ICH7M */
+	{ PCI_VENDOR_ID_INTEL, 0x27c2, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* ICH7R */
+	{ PCI_VENDOR_ID_INTEL, 0x27c3, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* ICH7R */
 	{ }	/* terminate list */
 };
 
diff -Nru a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sil.c	2005-01-27 18:42:36 -05:00
+++ b/drivers/scsi/sata_sil.c	2005-01-27 18:42:36 -05:00
@@ -90,6 +90,7 @@
 	{ "ST3120023AS",	SIL_QUIRK_MOD15WRITE },
 	{ "ST3160023AS",	SIL_QUIRK_MOD15WRITE },
 	{ "ST3120026AS",	SIL_QUIRK_MOD15WRITE },
+	{ "ST3200822AS",	SIL_QUIRK_MOD15WRITE },
 	{ "ST340014ASL",	SIL_QUIRK_MOD15WRITE },
 	{ "ST360014ASL",	SIL_QUIRK_MOD15WRITE },
 	{ "ST380011ASL",	SIL_QUIRK_MOD15WRITE },