diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /include/scsi/scsi_bsg_fc.h | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'include/scsi/scsi_bsg_fc.h')
| -rw-r--r-- | include/scsi/scsi_bsg_fc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_bsg_fc.h b/include/scsi/scsi_bsg_fc.h index a4b233318179..91a4e4ff9a9b 100644 --- a/include/scsi/scsi_bsg_fc.h +++ b/include/scsi/scsi_bsg_fc.h | |||
| @@ -292,7 +292,7 @@ struct fc_bsg_request { | |||
| 292 | struct fc_bsg_rport_els r_els; | 292 | struct fc_bsg_rport_els r_els; |
| 293 | struct fc_bsg_rport_ct r_ct; | 293 | struct fc_bsg_rport_ct r_ct; |
| 294 | } rqst_data; | 294 | } rqst_data; |
| 295 | }; | 295 | } __attribute__((packed)); |
| 296 | 296 | ||
| 297 | 297 | ||
| 298 | /* response (request sense data) structure of the sg_io_v4 */ | 298 | /* response (request sense data) structure of the sg_io_v4 */ |