path: root/drivers/char
diff options
authorStefan Berger <stefanb@linux.vnet.ibm.com>2011-07-18 09:11:55 -0400
committerJames Morris <jmorris@namei.org>2011-07-21 09:29:56 +1000
commit6eb77b214985f8c2568f1f20f941790fbf8bf97b (patch)
tree52e34cb937b8f87585b354216e31c6c428c4f1b8 /drivers/char
parent0f2a55d5bb2372058275b0b343d90dd5d640d045 (diff)
tpm: Fix compilation warning when CONFIG_PNP is not defined
The is_itpm() function is only accessed from a block surrounded by #ifdef CONFIG_PNP. Therefore, also surround it with #ifdef CONFIG_PNP and remove the #else branch causing the warning. http://lxr.linux.no/#linux+v2.6.39/drivers/char/tpm/tpm_tis.c#L622 v2: - fixes a previous typo Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/char')
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index ed97cfed30ea..2cf49b4168ae 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/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
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;
-static int is_itpm(struct pnp_dev *dev)
- return 0;
static int check_locality(struct tpm_chip *chip, int l)

Privacy Policy