From: Jeff Garzik Date: Thu, 10 Aug 2006 10:46:16 +0000 (-0400) Subject: Merge branch 'sii-m15w' into upstream X-Git-Tag: v2.6.19-rc1~1262^2~38 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=2b8ae728a8bada0cca10f30d3e7c52d384e8d5ad;hp=4852ba24f647199be797545226c6d325db231937 Merge branch 'sii-m15w' into upstream --- diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c index d0a85073ebf7..f4e262b06cf2 100644 --- a/drivers/scsi/sata_sil.c +++ b/drivers/scsi/sata_sil.c @@ -141,12 +141,8 @@ static const struct sil_drivelist { { "ST330013AS", SIL_QUIRK_MOD15WRITE }, { "ST340017AS", SIL_QUIRK_MOD15WRITE }, { "ST360015AS", SIL_QUIRK_MOD15WRITE }, - { "ST380013AS", SIL_QUIRK_MOD15WRITE }, { "ST380023AS", SIL_QUIRK_MOD15WRITE }, { "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 },