diff --git a/[refs] b/[refs]
index 528bf3f0c8e8..e400fcb241be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea6bfb0adf1361c2039adac3fcaca27f91d7c2c7
+refs/heads/master: b2dabd5aadae6a93026f35269e1e53c1a0c6de2d
diff --git a/trunk/drivers/net/wireless/hostap/hostap_pci.c b/trunk/drivers/net/wireless/hostap/hostap_pci.c
index 165f1450da57..4f567ef6178d 100644
--- a/trunk/drivers/net/wireless/hostap/hostap_pci.c
+++ b/trunk/drivers/net/wireless/hostap/hostap_pci.c
@@ -405,7 +405,7 @@ static void prism2_pci_remove(struct pci_dev *pdev)
 
 
 #ifdef CONFIG_PM
-static int prism2_pci_suspend(struct pci_dev *pdev, u32 state)
+static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);