diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 08:56:29 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 08:56:29 -0500 |
| commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
| tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /include/trace | |
| parent | 198a956a11b15b564ac06d1411881e215b587408 (diff) | |
| parent | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff) | |
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 45403443dd82..04c3c6efdcc2 100644 --- a/include/trace/events/target.h +++ b/include/trace/events/target.h | |||
| @@ -109,10 +109,10 @@ | |||
| 109 | 109 | ||
| 110 | #define show_task_attribute_name(val) \ | 110 | #define show_task_attribute_name(val) \ |
| 111 | __print_symbolic(val, \ | 111 | __print_symbolic(val, \ |
| 112 | { MSG_SIMPLE_TAG, "SIMPLE" }, \ | 112 | { TCM_SIMPLE_TAG, "SIMPLE" }, \ |
| 113 | { MSG_HEAD_TAG, "HEAD" }, \ | 113 | { TCM_HEAD_TAG, "HEAD" }, \ |
| 114 | { MSG_ORDERED_TAG, "ORDERED" }, \ | 114 | { TCM_ORDERED_TAG, "ORDERED" }, \ |
| 115 | { MSG_ACA_TAG, "ACA" } ) | 115 | { TCM_ACA_TAG, "ACA" } ) |
| 116 | 116 | ||
| 117 | #define show_scsi_status_name(val) \ | 117 | #define show_scsi_status_name(val) \ |
| 118 | __print_symbolic(val, \ | 118 | __print_symbolic(val, \ |