From 8916c2551ef056739f57cc5ee3a28bce39c2ec94 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Mon, 18 Jul 2011 09:11:55 -0400
Subject: [PATCH] --- yaml --- r: 260957 b: refs/heads/master c:
 6eb77b214985f8c2568f1f20f941790fbf8bf97b h: refs/heads/master i:   260955:
 230893699ab990b855dd60d3d1b20dd6a69e8f36 v: v3

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

diff --git a/[refs] b/[refs]
index 85e46f9d32f0..73d0c0a4af89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f2a55d5bb2372058275b0b343d90dd5d640d045
+refs/heads/master: 6eb77b214985f8c2568f1f20f941790fbf8bf97b
diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
index ed97cfed30ea..2cf49b4168ae 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_ACPI
+#ifdef CONFIG_PNP
 static int is_itpm(struct pnp_dev *dev)
 {
 	struct acpi_device *acpi = pnp_acpi_device(dev);
@@ -93,11 +93,6 @@ static int is_itpm(struct pnp_dev *dev)
 
 	return 0;
 }
-#else
-static int is_itpm(struct pnp_dev *dev)
-{
-	return 0;
-}
 #endif
 
 static int check_locality(struct tpm_chip *chip, int l)