summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-07 16:28:15 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-07 16:28:15 -0700
commit878a667394501e03cd27b393b87cf472fa74122c (patch)
treeced0833ecf8fab9abe9f10976116ff3ac4cb79b4
parent624573d0d480a003c9ba042f524f311aef2e7c5f (diff)
downloadop-kernel-dev-878a667394501e03cd27b393b87cf472fa74122c.zip
op-kernel-dev-878a667394501e03cd27b393b87cf472fa74122c.tar.gz
Staging: brcm80211: remove unneeded pm macro
Use the real type, not a macro. Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/include/linuxver.h3
-rw-r--r--drivers/staging/brcm80211/sys/wl_mac80211.c2
2 files changed, 1 insertions, 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 <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/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;
OpenPOWER on IntegriCloud