aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 11:26:04 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 11:26:04 -0700
commit955c5038823748e529a49f0e33ab635d92843500 (patch)
tree371d937281474e6abf09b9a893966c85c5e9ad70 /include
parent62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (diff)
parent2ab540becd1bcf9c6886370fd8c67e56dd1c9f3a (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include')
-rw-r--r--include/scsi/scsi.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index b361172b576..6cb1e2788d8 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -116,6 +116,9 @@ extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
/* values for service action in */
#define SAI_READ_CAPACITY_16 0x10
+/* Values for T10/04-262r7 */
+#define ATA_16 0x85 /* 16-byte pass-thru */
+#define ATA_12 0xa1 /* 12-byte pass-thru */
/*
* SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft