@ -4167,15 +4167,13 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
{ " WDC AC23200L " , " 21.10N21 " , ATA_HORKAGE_NODMA } ,
{ " Compaq CRD-8241B " , NULL , ATA_HORKAGE_NODMA } ,
{ " CRD-8400B " , NULL , ATA_HORKAGE_NODMA } ,
{ " CRD-8480B " , NULL , ATA_HORKAGE_NODMA } ,
{ " CRD-8482B " , NULL , ATA_HORKAGE_NODMA } ,
{ " CRD-848[02]B " , NULL , ATA_HORKAGE_NODMA } ,
{ " CRD-84 " , NULL , ATA_HORKAGE_NODMA } ,
{ " SanDisk SDP3B " , NULL , ATA_HORKAGE_NODMA } ,
{ " SanDisk SDP3B-64 " , NULL , ATA_HORKAGE_NODMA } ,
{ " SANYO CD-ROM CRD " , NULL , ATA_HORKAGE_NODMA } ,
{ " HITACHI CDR-8 " , NULL , ATA_HORKAGE_NODMA } ,
{ " HITACHI CDR-8335 " , NULL , ATA_HORKAGE_NODMA } ,
{ " HITACHI CDR-8435 " , NULL , ATA_HORKAGE_NODMA } ,
{ " HITACHI CDR-8[34]35 " , NULL , ATA_HORKAGE_NODMA } ,
{ " Toshiba CD-ROM XM-6202B " , NULL , ATA_HORKAGE_NODMA } ,
{ " TOSHIBA CD-ROM XM-1702BC " , NULL , ATA_HORKAGE_NODMA } ,
{ " CD-532E-A " , NULL , ATA_HORKAGE_NODMA } ,
@ -4255,12 +4253,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
/* Devices which get the IVB wrong */
{ " QUANTUM FIREBALLlct10 05 " , " A03.0900 " , ATA_HORKAGE_IVB , } ,
/* Maybe we should just blacklist TSSTcorp... */
{ " TSSTcorp CDDVDW SH-S202H " , " SB00 " , ATA_HORKAGE_IVB , } ,
{ " TSSTcorp CDDVDW SH-S202H " , " SB01 " , ATA_HORKAGE_IVB , } ,
{ " TSSTcorp CDDVDW SH-S202J " , " SB00 " , ATA_HORKAGE_IVB , } ,
{ " TSSTcorp CDDVDW SH-S202J " , " SB01 " , ATA_HORKAGE_IVB , } ,
{ " TSSTcorp CDDVDW SH-S202N " , " SB00 " , ATA_HORKAGE_IVB , } ,
{ " TSSTcorp CDDVDW SH-S202N " , " SB01 " , ATA_HORKAGE_IVB , } ,
{ " TSSTcorp CDDVDW SH-S202[HJN] " , " SB0[01] " , ATA_HORKAGE_IVB , } ,
/* Devices that do not need bridging limits applied */
{ " MTRON MSP-SATA* " , NULL , ATA_HORKAGE_BRIDGE_OK , } ,