From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Mon, 18 Jul 2011 13:11:55 +0000 (-0400)
Subject: tpm: Fix compilation warning when CONFIG_PNP is not defined
X-Git-Tag: v3.1-rc1~133^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eb77b214985f8c2568f1f20f941790fbf8bf97b;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed