git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
drivers
/
char
/
tpm
/
tpm_tis.c
diff --git
a/drivers/char/tpm/tpm_tis.c
b/drivers/char/tpm/tpm_tis.c
index
2405f17
..
9434599
100644
(file)
--- a/
drivers/char/tpm/tpm_tis.c
+++ b/
drivers/char/tpm/tpm_tis.c
@@
-22,6
+22,7
@@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/pnp.h>
+#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/wait.h>
#include "tpm.h"