diff options
author | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:53:40 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:53:40 -0700 |
commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
tree | 2b226019e7b1344f05e44d79da956a5306d20780 /include/scsi/osd_protocol.h | |
parent | e0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff) | |
parent | e689cf0caf2d5ebcb300fb69887d35c0abdbdb97 (diff) |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi/osd_protocol.h')
-rw-r--r-- | include/scsi/osd_protocol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h index a6026da25f3e..25ac6283b9c7 100644 --- a/include/scsi/osd_protocol.h +++ b/include/scsi/osd_protocol.h @@ -107,7 +107,7 @@ enum osd_attributes_mode { * int exponent: 04; * } */ -typedef __be32 __bitwise osd_cdb_offset; +typedef __be32 osd_cdb_offset; enum { OSD_OFFSET_UNUSED = 0xFFFFFFFF, |