From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 29 Aug 2005 23:01:43 +0000 (-0400)
Subject: Merge upstream kernel into libata 'passthru' branch
X-Git-Tag: v2.6.15-rc1~732^2~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=da61396d24e37258817e42537c482e962b4742f7;p=linux.git

Merge upstream kernel into libata 'passthru' branch
---

da61396d24e37258817e42537c482e962b4742f7
diff --cc drivers/scsi/libata-scsi.c
index 3ba1fefb8374,346eb36b1e31..a980701d06c7
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@@ -1877,10 -1510,8 +1953,13 @@@ static inline ata_xlat_func_t ata_get_x
  	case VERIFY:
  	case VERIFY_16:
  		return ata_scsi_verify_xlat;
 +
 +	case ATA_12:
 +	case ATA_16:
 +		return ata_scsi_pass_thru;
++
+ 	case START_STOP:
+ 		return ata_scsi_start_stop_xlat;
  	}
  
  	return NULL;