diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /include/trace | |
parent | 198a956a11b15b564ac06d1411881e215b587408 (diff) | |
parent | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff) | |
download | op-kernel-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip op-kernel-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.gz |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/target.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/events/target.h b/include/trace/events/target.h index 4540344..04c3c6ef 100644 --- a/include/trace/events/target.h +++ b/include/trace/events/target.h @@ -109,10 +109,10 @@ #define show_task_attribute_name(val) \ __print_symbolic(val, \ - { MSG_SIMPLE_TAG, "SIMPLE" }, \ - { MSG_HEAD_TAG, "HEAD" }, \ - { MSG_ORDERED_TAG, "ORDERED" }, \ - { MSG_ACA_TAG, "ACA" } ) + { TCM_SIMPLE_TAG, "SIMPLE" }, \ + { TCM_HEAD_TAG, "HEAD" }, \ + { TCM_ORDERED_TAG, "ORDERED" }, \ + { TCM_ACA_TAG, "ACA" } ) #define show_scsi_status_name(val) \ __print_symbolic(val, \ |