summaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/usb.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 17:19:10 +0200
committerAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 17:19:10 +0200
commitddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch)
treeaaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/usb/storage/usb.h
parentMerge branch 'master' of /usr/src/linux-2.6 (diff)
parentMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff)
downloadlinux-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.xz
linux-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/storage/usb.h')
-rw-r--r--drivers/usb/storage/usb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 625b7aa98074..a195adae57b6 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -158,6 +158,7 @@ struct us_data {
/* SCSI interfaces */
struct scsi_cmnd *srb; /* current srb */
+ unsigned int tag; /* current dCBWTag */
/* thread information */
int pid; /* control thread */