diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2008-11-20 14:22:18 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-07 12:59:57 -0500 |
| commit | 3dae5345311271fe598a61bd01f563fc835b4217 (patch) | |
| tree | 0342454943c439dd01760fb139fe04403a824fa5 /drivers/usb/storage/protocol.h | |
| parent | 64648a9dc4d7ac0189364188207310ec6bc75bbe (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.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/storage/protocol.h b/drivers/usb/storage/protocol.h index 487056ffb516..ffc3e2af0156 100644 --- a/drivers/usb/storage/protocol.h +++ b/drivers/usb/storage/protocol.h | |||
| @@ -40,8 +40,7 @@ | |||
| 40 | #define _PROTOCOL_H_ | 40 | #define _PROTOCOL_H_ |
| 41 | 41 | ||
| 42 | /* Protocol handling routines */ | 42 | /* Protocol handling routines */ |
| 43 | extern void usb_stor_ATAPI_command(struct scsi_cmnd*, struct us_data*); | 43 | extern void usb_stor_pad12_command(struct scsi_cmnd*, struct us_data*); |
| 44 | extern void usb_stor_qic157_command(struct scsi_cmnd*, struct us_data*); | ||
| 45 | extern void usb_stor_ufi_command(struct scsi_cmnd*, struct us_data*); | 44 | extern void usb_stor_ufi_command(struct scsi_cmnd*, struct us_data*); |
| 46 | extern void usb_stor_transparent_scsi_command(struct scsi_cmnd*, | 45 | extern void usb_stor_transparent_scsi_command(struct scsi_cmnd*, |
| 47 | struct us_data*); | 46 | struct us_data*); |