From e63533ff541f16f1af0d858730d67ff62662e1ec Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 16 Apr 2005 15:25:24 -0700
Subject: [PATCH] --- yaml --- r: 107 b: refs/heads/master c:
 4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c h: refs/heads/master i:   105:
 590cb1786dd0cdb2bc7536261f0172101e7465a5   103:
 2f624f0975d122b3f87e6f509db6f3d9f247442d v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/char/agp/efficeon-agp.c | 2 +-
 trunk/drivers/char/s3c2410-rtc.c      | 2 +-
 trunk/drivers/char/sonypi.c           | 2 +-
 trunk/drivers/char/tpm/tpm.c          | 2 +-
 trunk/drivers/char/tpm/tpm.h          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d76957dd6a88..02c410bc1e73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 438510f6f079e94df294936b5bd8a7fd679cd1c9
+refs/heads/master: 4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c
diff --git a/trunk/drivers/char/agp/efficeon-agp.c b/trunk/drivers/char/agp/efficeon-agp.c
index 52c0a097118c..2a87cecdc912 100644
--- a/trunk/drivers/char/agp/efficeon-agp.c
+++ b/trunk/drivers/char/agp/efficeon-agp.c
@@ -408,7 +408,7 @@ static void __devexit agp_efficeon_remove(struct pci_dev *pdev)
 	agp_put_bridge(bridge);
 }
 
-static int agp_efficeon_suspend(struct pci_dev *dev, u32 state)
+static int agp_efficeon_suspend(struct pci_dev *dev, pm_message_t state)
 {
 	return 0;
 }
diff --git a/trunk/drivers/char/s3c2410-rtc.c b/trunk/drivers/char/s3c2410-rtc.c
index ec666395a26c..8e61be34a1d3 100644
--- a/trunk/drivers/char/s3c2410-rtc.c
+++ b/trunk/drivers/char/s3c2410-rtc.c
@@ -515,7 +515,7 @@ static struct timespec s3c2410_rtc_delta;
 
 static int ticnt_save;
 
-static int s3c2410_rtc_suspend(struct device *dev, u32 state, u32 level)
+static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	struct rtc_time tm;
 	struct timespec time;
diff --git a/trunk/drivers/char/sonypi.c b/trunk/drivers/char/sonypi.c
index f97a8a9751a0..c812191417c3 100644
--- a/trunk/drivers/char/sonypi.c
+++ b/trunk/drivers/char/sonypi.c
@@ -1103,7 +1103,7 @@ static int sonypi_disable(void)
 #ifdef CONFIG_PM
 static int old_camera_power;
 
-static int sonypi_suspend(struct device *dev, u32 state, u32 level)
+static int sonypi_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	if (level == SUSPEND_DISABLE) {
 		old_camera_power = sonypi_device.camera_power;
diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c
index 8318268169d6..ca36087d4f8a 100644
--- a/trunk/drivers/char/tpm/tpm.c
+++ b/trunk/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/trunk/drivers/char/tpm/tpm.h b/trunk/drivers/char/tpm/tpm.h
index 575cf5aed41a..de0c796fce80 100644
--- a/trunk/drivers/char/tpm/tpm.h
+++ b/trunk/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 *);