From 878a667394501e03cd27b393b87cf472fa74122c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Oct 2010 16:28:15 -0700 Subject: [PATCH] Staging: brcm80211: remove unneeded pm macro Use the real type, not a macro. Cc: Brett Rudley Cc: Henry Ptasinski Cc: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/include/linuxver.h | 3 --- drivers/staging/brcm80211/sys/wl_mac80211.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h index 921cf66..a2b082f 100644 --- a/drivers/staging/brcm80211/include/linuxver.h +++ b/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 #include -/* suspend args */ -#define DRV_SUSPEND_STATE_TYPE pm_message_t - #define CHECKSUM_HW CHECKSUM_PARTIAL #include diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index a2e5feb..2360815 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/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; -- 2.7.4