summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-17 00:25:24 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 00:25:24 +0200
commit4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (patch)
tree4836046f082166b604e43eb3c6009682007ba5fe /drivers/char/tpm/tpm.c
parent[PATCH] pm_message_t: more fixes in common and i386 (diff)
downloadlinux-4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c.tar.xz
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/tpm.c')
-rw-r--r--drivers/char/tpm/tpm.c2
1 files changed, 1 insertions, 1 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)