diff --git a/[refs] b/[refs]
index 8e5dc2ac5804..9e92c8bbe347 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 624573d0d480a003c9ba042f524f311aef2e7c5f
+refs/heads/master: 878a667394501e03cd27b393b87cf472fa74122c
diff --git a/trunk/drivers/staging/brcm80211/include/linuxver.h b/trunk/drivers/staging/brcm80211/include/linuxver.h
index 921cf66636f8..a2b082fad265 100644
--- a/trunk/drivers/staging/brcm80211/include/linuxver.h
+++ b/trunk/drivers/staging/brcm80211/include/linuxver.h
@@ -39,9 +39,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);
 #include <linux/sched.h>
 #include <linux/ieee80211.h>
 
-/* suspend args */
-#define DRV_SUSPEND_STATE_TYPE pm_message_t
-
 #define CHECKSUM_HW	CHECKSUM_PARTIAL
 
 #include <linux/time.h>
diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
index a2e5feb8aa9b..2360815a49d6 100644
--- a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -1359,7 +1359,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 }
 
 #ifdef LINUXSTA_PS
-static int wl_suspend(struct pci_dev *pdev, DRV_SUSPEND_STATE_TYPE state)
+static int wl_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	wl_info_t *wl;
 	struct ieee80211_hw *hw;