From b0a4de970bba75f96e164b95402bbdbc6fd473ca Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 25 Mar 2006 03:07:35 -0800
Subject: [PATCH] --- yaml --- r: 23561 b: refs/heads/master c:
 276ad0c109e69a32b634f0550d096f9381135b7d h: refs/heads/master i:   23559:
 f9f701b3351e13294d390345161bfc495907d63f v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/char/tpm/tpm.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 996c9b56236b..b69dd87b127f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44575b2f0873c30ba6010e58048b317474f2bbd0
+refs/heads/master: 276ad0c109e69a32b634f0550d096f9381135b7d
diff --git a/trunk/drivers/char/tpm/tpm.h b/trunk/drivers/char/tpm/tpm.h
index fd3a4beaa53d..dec0224b4478 100644
--- a/trunk/drivers/char/tpm/tpm.h
+++ b/trunk/drivers/char/tpm/tpm.h
@@ -24,6 +24,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 enum tpm_timeout {
 	TPM_TIMEOUT = 5,	/* msecs */