Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Tue, 29 Sep 2009 21:47:33 +0000 (07:47 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 29 Sep 2009 21:47:33 +0000 (07:47 +1000)
drivers/char/tpm/tpm.c

index 45d58002b06c0087ad5ece5a2bbb14a844f574c0..aeafac5bde8cdf82cb2fac19e787ab58bb46afcb 100644 (file)
@@ -31,7 +31,7 @@
 
 enum tpm_const {
        TPM_MINOR = 224,        /* officially assigned */
-       TPM_BUFSIZE = 2048,
+       TPM_BUFSIZE = 4096,
        TPM_NUM_DEVICES = 256,
 };