diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 16:53:40 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 16:53:40 +0200 |
| commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
| tree | 2b226019e7b1344f05e44d79da956a5306d20780 /drivers/scsi/ipr.h | |
| parent | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| parent | [SCSI] qla2xxx: Update firmware link in Kconfig file. (diff) | |
| download | linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.xz linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.zip | |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/ipr.h')
| -rw-r--r-- | drivers/scsi/ipr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index 21a6ff1ed5c6..a1fb840596ef 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h @@ -552,7 +552,7 @@ struct ipr_ioarcb_ata_regs { /* 22 bytes */ u8 hob_lbam; u8 hob_lbah; u8 ctl; -}__attribute__ ((packed, aligned(4))); +}__attribute__ ((packed, aligned(2))); struct ipr_ioadl_desc { __be32 flags_and_data_len; |