Manual merge with Linus

1 files changed, 0 insertions, 16 deletions

diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index 98719407d554..6a140020d7cb 100644
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -54,20 +54,4 @@ extern void scsi_do_req(struct scsi_request *, const void *cmnd,
                         void *buffer, unsigned bufflen,
                         void (*done) (struct scsi_cmnd *),
                         int timeout, int retries);
-
-struct scsi_mode_data {
-        __u32   length;
-        __u16   block_descriptor_length;
-        __u8    medium_type;
-        __u8    device_specific;
-        __u8    header_length;
-        __u8    longlba:1;
-};
-
-extern int __scsi_mode_sense(struct scsi_request *SRpnt, int dbd,
-                             int modepage, unsigned char *buffer, int len,
-                             int timeout, int retries,
-                             struct scsi_mode_data *data);
-
-
 #endif /* _SCSI_SCSI_REQUEST_H */