]> git.openfabrics.org - ~shefty/rdma-dev.git/blobdiff - drivers/char/tpm/tpm_tis.c
tpm_tis: fix build when ACPI is not enabled
[~shefty/rdma-dev.git] / drivers / char / tpm / tpm_tis.c
index 7fc2f108f4904debbc306664816fa8259d8d354b..3f4051a7c5a770440d8d0b32893c1885fa796480 100644 (file)
@@ -80,7 +80,7 @@ enum tis_defaults {
 static LIST_HEAD(tis_chips);
 static DEFINE_SPINLOCK(tis_lock);
 
-#ifdef CONFIG_PNP
+#if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
 static int is_itpm(struct pnp_dev *dev)
 {
        struct acpi_device *acpi = pnp_acpi_device(dev);
@@ -93,6 +93,11 @@ static int is_itpm(struct pnp_dev *dev)
 
        return 0;
 }
+#else
+static inline int is_itpm(struct pnp_dev *dev)
+{
+       return 0;
+}
 #endif
 
 static int check_locality(struct tpm_chip *chip, int l)