From c926d6d99e34992574ed370ec7b96d73daf4db64 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 16 Apr 2005 15:25:28 -0700
Subject: [PATCH] --- yaml --- r: 111 b: refs/heads/master c:
 8d189f729829369edb2e797e9a6ebc2b01b359d0 h: refs/heads/master i:   109:
 11032840f44024b47a5c59fd516cbb03a6e006c2   107:
 e63533ff541f16f1af0d858730d67ff62662e1ec   103:
 2f624f0975d122b3f87e6f509db6f3d9f247442d   95:
 93d9527fbf8ada382c9b160aa691eb7c60390ba7 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/message/fusion/mptbase.c  | 2 +-
 trunk/drivers/message/fusion/mptbase.h  | 2 +-
 trunk/drivers/message/fusion/mptscsih.c | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index af07949310f1..4d4f9a84b02d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a291068991c4d0cc4c2bd533094422bf417c86dd
+refs/heads/master: 8d189f729829369edb2e797e9a6ebc2b01b359d0
diff --git a/trunk/drivers/message/fusion/mptbase.c b/trunk/drivers/message/fusion/mptbase.c
index 942cc1c2a186..8b22630f1aef 100644
--- a/trunk/drivers/message/fusion/mptbase.c
+++ b/trunk/drivers/message/fusion/mptbase.c
@@ -1429,7 +1429,7 @@ mptbase_shutdown(struct device * dev)
  *
  */
 static int
-mptbase_suspend(struct pci_dev *pdev, u32 state)
+mptbase_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	u32 device_state;
 	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
diff --git a/trunk/drivers/message/fusion/mptbase.h b/trunk/drivers/message/fusion/mptbase.h
index be673070bc34..6d16acc7a179 100644
--- a/trunk/drivers/message/fusion/mptbase.h
+++ b/trunk/drivers/message/fusion/mptbase.h
@@ -215,7 +215,7 @@ struct mpt_pci_driver{
 	void (*shutdown) (struct device * dev);
 #ifdef CONFIG_PM
 	int  (*resume) (struct pci_dev *dev);
-	int  (*suspend) (struct pci_dev *dev, u32 state);
+	int  (*suspend) (struct pci_dev *dev, pm_message_t state);
 #endif
 };
 
diff --git a/trunk/drivers/message/fusion/mptscsih.c b/trunk/drivers/message/fusion/mptscsih.c
index c98d6257ec02..3a3ef127df04 100644
--- a/trunk/drivers/message/fusion/mptscsih.c
+++ b/trunk/drivers/message/fusion/mptscsih.c
@@ -220,7 +220,7 @@ static int  mptscsih_probe (struct pci_dev *, const struct pci_device_id *);
 static void mptscsih_remove(struct pci_dev *);
 static void mptscsih_shutdown(struct device *);
 #ifdef CONFIG_PM
-static int mptscsih_suspend(struct pci_dev *pdev, u32 state);
+static int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);
 static int mptscsih_resume(struct pci_dev *pdev);
 #endif
 
@@ -1389,7 +1389,7 @@ mptscsih_shutdown(struct device * dev)
  *
  */
 static int
-mptscsih_suspend(struct pci_dev *pdev, u32 state)
+mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	mptscsih_shutdown(&pdev->dev);
 	return 0;