From: Peter Huewe <peterhuewe@gmx.de>
Date: Wed, 21 Jan 2015 23:42:50 +0000 (+0100)
Subject: tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device
X-Git-Tag: fixes-v4.0-rc1~129^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=961be7ef6963806cb978ccd6acf6bf84b0c63346;p=pandora-kernel.git

tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device

This fixes a build failure if CONFIG_PNP is set but CONFIG_ACPI is not:
drivers/char/tpm/tpm_tis.c: In function ?tpm_tis_pnp_init?:
drivers/char/tpm/tpm_tis.c:912:45: error: invalid type argument of
?->? (have ?int?)
   acpi_dev_handle = pnp_acpi_device(pnp_dev)->handle;

If CONFIG_PNPACPI is not set pnp_acpi_device is defined as 0 and thus
accesing the handle is not possible.

Fixes: 0dc553652102 ("tpm: fix raciness of PPI interface lookup")
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: James Morris <james.l.morris@oracle.com>
---

Reading git-diff-tree failed