| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Wed Sep 30 07:47:33 2009 +1000 |
| committer | James Morris <jmorris@namei.org> | Wed Sep 30 07:47:33 2009 +1000 |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f [diff] | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c [diff] |
Merge branch 'master' into next
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index 45d5800..aeafac5 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c
@@ -31,7 +31,7 @@ enum tpm_const { TPM_MINOR = 224, /* officially assigned */ - TPM_BUFSIZE = 2048, + TPM_BUFSIZE = 4096, TPM_NUM_DEVICES = 256, };