diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:24 -0700 |
| commit | 4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (patch) | |
| tree | 4836046f082166b604e43eb3c6009682007ba5fe /drivers/char/tpm | |
| parent | 438510f6f079e94df294936b5bd8a7fd679cd1c9 (diff) | |
| download | blackbird-op-linux-4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c.tar.gz blackbird-op-linux-4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c.zip | |
[PATCH] Fix u32 vs. pm_message_t in drivers/char
Here are fixes for drivers/char.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/tpm')
| -rw-r--r-- | drivers/char/tpm/tpm.c | 2 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm.h | 2 |
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[] = { * We are about to suspend. Save the TPM state * so that it can be restored. */ -int tpm_pm_suspend(struct pci_dev *pci_dev, u32 pm_state) +int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state) { struct tpm_chip *chip = pci_get_drvdata(pci_dev); 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, loff_t *); extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); extern void __devexit tpm_remove(struct pci_dev *); -extern int tpm_pm_suspend(struct pci_dev *, u32); +extern int tpm_pm_suspend(struct pci_dev *, pm_message_t); extern int tpm_pm_resume(struct pci_dev *); |
