Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / bsg.h

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index 0475a6d3ff6ad5a28711a23ba046c9552a29f482..8547b10c388b5fedae1da1982a7f17e947f90708 100644 (file)
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -1,6 +1,12 @@
 #ifndef BSG_H
 #define BSG_H
 
+#define BSG_PROTOCOL_SCSI              0
+
+#define BSG_SUB_PROTOCOL_SCSI_CMD      0
+#define BSG_SUB_PROTOCOL_SCSI_TMF      1
+#define BSG_SUB_PROTOCOL_SCSI_TRANSPORT        2
+
 struct sg_io_v4 {
        __s32 guard;            /* [i] 'Q' to differentiate from v3 */
        __u32 protocol;         /* [i] 0 -> SCSI , .... */
@@ -51,10 +57,9 @@ struct bsg_class_device {
        struct request_queue *queue;
 };
 
-extern int bsg_register_queue(struct request_queue *, char *);
+extern int bsg_register_queue(struct request_queue *, const char *);
 extern void bsg_unregister_queue(struct request_queue *);
 #else
-struct bsg_class_device { };
 #define bsg_register_queue(disk, name)         (0)
 #define bsg_unregister_queue(disk)     do { } while (0)
 #endif