diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
| commit | f2006e27396f55276f24434f56e208d86e7f9908 (patch) | |
| tree | 71896db916d33888b4286f80117d3cac0da40e6d /include/linux/tpm.h | |
| parent | e399eb56a6110e13f97e644658648602e2b08de7 (diff) | |
| parent | 9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e (diff) | |
Merge branch 'linus' into timers/urgent
Get upstream changes so we can apply fixes against them
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/tpm.h')
| -rw-r--r-- | include/linux/tpm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/tpm.h b/include/linux/tpm.h index fcb627ff8d3e..9a9051bb1a03 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h | |||
| @@ -22,6 +22,8 @@ | |||
| 22 | #ifndef __LINUX_TPM_H__ | 22 | #ifndef __LINUX_TPM_H__ |
| 23 | #define __LINUX_TPM_H__ | 23 | #define __LINUX_TPM_H__ |
| 24 | 24 | ||
| 25 | #define TPM_DIGEST_SIZE 20 /* Max TPM v1.2 PCR size */ | ||
| 26 | |||
| 25 | /* | 27 | /* |
| 26 | * Chip num is this value or a valid tpm idx | 28 | * Chip num is this value or a valid tpm idx |
| 27 | */ | 29 | */ |