aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r--drivers/char/tpm/tpm.c2
-rw-r--r--drivers/char/tpm/tpm.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 8318268169d6..ca36087d4f8a 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -567,7 +567,7 @@ static u8 savestate[] = {
567 * We are about to suspend. Save the TPM state 567 * We are about to suspend. Save the TPM state
568 * so that it can be restored. 568 * so that it can be restored.
569 */ 569 */
570int tpm_pm_suspend(struct pci_dev *pci_dev, u32 pm_state) 570int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state)
571{ 571{
572 struct tpm_chip *chip = pci_get_drvdata(pci_dev); 572 struct tpm_chip *chip = pci_get_drvdata(pci_dev);
573 if (chip == NULL) 573 if (chip == NULL)
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 575cf5aed41a..de0c796fce80 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -89,5 +89,5 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t,
89 loff_t *); 89 loff_t *);
90extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); 90extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
91extern void __devexit tpm_remove(struct pci_dev *); 91extern void __devexit tpm_remove(struct pci_dev *);
92extern int tpm_pm_suspend(struct pci_dev *, u32); 92extern int tpm_pm_suspend(struct pci_dev *, pm_message_t);
93extern int tpm_pm_resume(struct pci_dev *); 93extern int tpm_pm_resume(struct pci_dev *);