tpm: Fix compilation warning when CONFIG_PNP is not defined
authorStefan Berger <stefanb@linux.vnet.ibm.com>
Mon, 18 Jul 2011 13:11:55 +0000 (09:11 -0400)
committerJames Morris <jmorris@namei.org>
Wed, 20 Jul 2011 23:29:56 +0000 (09:29 +1000)
commit6eb77b214985f8c2568f1f20f941790fbf8bf97b
tree52e34cb937b8f87585b354216e31c6c428c4f1b8
parent0f2a55d5bb2372058275b0b343d90dd5d640d045
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>
drivers/char/tpm/tpm_tis.c