From ead1d61243bd44e4edc7f36db552d0a2990f66c5 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed, 3 Aug 2011 16:21:11 -0700
Subject: [PATCH] --- yaml --- r: 262309 b: refs/heads/master c:
 1560ffe62a9d53a51faeec7417becfba4f2a0d18 h: refs/heads/master i:   262307:
 dd6f3ada613afac781298bf7f4fe66e747f03312 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/tpm/tpm_tis.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b7d48c42bf69..9db8f623e944 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dab1bce8e840606e76f1bad5a009328e2aa35c7
+refs/heads/master: 1560ffe62a9d53a51faeec7417becfba4f2a0d18
diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
index 7fc2f108f490..3f4051a7c5a7 100644
--- a/trunk/drivers/char/tpm/tpm_tis.c
+++ b/trunk/drivers/char/tpm/tpm_tis.c
@@ -80,7 +80,7 @@ enum tis_defaults {
 static LIST_HEAD(tis_chips);
 static DEFINE_SPINLOCK(tis_lock);
 
-#ifdef CONFIG_PNP
+#if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
 static int is_itpm(struct pnp_dev *dev)
 {
 	struct acpi_device *acpi = pnp_acpi_device(dev);
@@ -93,6 +93,11 @@ static int is_itpm(struct pnp_dev *dev)
 
 	return 0;
 }
+#else
+static inline int is_itpm(struct pnp_dev *dev)
+{
+	return 0;
+}
 #endif
 
 static int check_locality(struct tpm_chip *chip, int l)