Hi!
This fixes u32 vs. pm_message_t in drivers/message. [These patches are
independend and change no object code; therefore not numbered].
Please apply,
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Pavel
--- clean-cvs/drivers/message/fusion/mptbase.c 2005-03-29 13:29:59.000000000
+0200
+++ linux-cvs/drivers/message/fusion/mptbase.c 2005-03-31 23:54:45.000000000
+0200
@@ -1429,7 +1429,7 @@
*
*/
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);
--- clean-cvs/drivers/message/fusion/mptbase.h 2005-03-31 23:33:38.000000000
+0200
+++ linux-cvs/drivers/message/fusion/mptbase.h 2005-03-31 23:54:45.000000000
+0200
@@ -215,7 +215,7 @@
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
};
--- clean-cvs/drivers/message/fusion/mptscsih.c 2005-03-31 23:33:38.000000000
+0200
+++ linux-cvs/drivers/message/fusion/mptscsih.c 2005-03-31 23:54:45.000000000
+0200
@@ -220,7 +220,7 @@
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 @@
*
*/
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;
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
