diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 7 |
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 { | |||
80 | static LIST_HEAD(tis_chips); | 80 | static LIST_HEAD(tis_chips); |
81 | static DEFINE_SPINLOCK(tis_lock); | 81 | static DEFINE_SPINLOCK(tis_lock); |
82 | 82 | ||
83 | #ifdef CONFIG_ACPI | 83 | #ifdef CONFIG_PNP |
84 | static int is_itpm(struct pnp_dev *dev) | 84 | static int is_itpm(struct pnp_dev *dev) |
85 | { | 85 | { |
86 | struct acpi_device *acpi = pnp_acpi_device(dev); | 86 | struct acpi_device *acpi = pnp_acpi_device(dev); |
@@ -93,11 +93,6 @@ static int is_itpm(struct pnp_dev *dev) | |||
93 | 93 | ||
94 | return 0; | 94 | return 0; |
95 | } | 95 | } |
96 | #else | ||
97 | static int is_itpm(struct pnp_dev *dev) | ||
98 | { | ||
99 | return 0; | ||
100 | } | ||
101 | #endif | 96 | #endif |
102 | 97 | ||
103 | static int check_locality(struct tpm_chip *chip, int l) | 98 | static int check_locality(struct tpm_chip *chip, int l) |