summaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/protocol.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-11-20 14:22:18 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 09:59:57 -0800
commit3dae5345311271fe598a61bd01f563fc835b4217 (patch)
tree0342454943c439dd01760fb139fe04403a824fa5 /drivers/usb/storage/protocol.h
parent64648a9dc4d7ac0189364188207310ec6bc75bbe (diff)
USB: usb-storage: merge ATAPI and QIC-157 protocol routines
This patch (as1174) merges usb-storage's QIC-157 and ATAPI protocol routines. Since the two functions are identical, there's no reason to keep them separate. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/protocol.h')
-rw-r--r--drivers/usb/storage/protocol.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/storage/protocol.h b/drivers/usb/storage/protocol.h
index 487056ffb51..ffc3e2af015 100644
--- a/drivers/usb/storage/protocol.h
+++ b/drivers/usb/storage/protocol.h
@@ -40,8 +40,7 @@
#define _PROTOCOL_H_
/* Protocol handling routines */
-extern void usb_stor_ATAPI_command(struct scsi_cmnd*, struct us_data*);
-extern void usb_stor_qic157_command(struct scsi_cmnd*, struct us_data*);
+extern void usb_stor_pad12_command(struct scsi_cmnd*, struct us_data*);
extern void usb_stor_ufi_command(struct scsi_cmnd*, struct us_data*);
extern void usb_stor_transparent_scsi_command(struct scsi_cmnd*,
struct us_data*);