diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
| commit | cd0e075784f4bce97b4ed47d4b354f045e895546 (patch) | |
| tree | 2354d4c2f5185c59dc21c537841b55c694cc53ec /drivers/char/tpm/tpm_ibmvtpm.h | |
| parent | usb: phy: msm: Remove dead code (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-cd0e075784f4bce97b4ed47d4b354f045e895546.tar.xz linux-cd0e075784f4bce97b4ed47d4b354f045e895546.zip | |
Merge 4.0-rc5 into usb-next
We want the USB fixes in here as well to resolve merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/tpm/tpm_ibmvtpm.h')
| -rw-r--r-- | drivers/char/tpm/tpm_ibmvtpm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm_ibmvtpm.h b/drivers/char/tpm/tpm_ibmvtpm.h index f595f14426bf..6af92890518f 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.h +++ b/drivers/char/tpm/tpm_ibmvtpm.h @@ -22,9 +22,9 @@ struct ibmvtpm_crq { u8 valid; u8 msg; - u16 len; - u32 data; - u64 reserved; + __be16 len; + __be32 data; + __be64 reserved; } __attribute__((packed, aligned(8))); struct ibmvtpm_crq_queue { |