From 3eed303acc7f2099c8adbc7647a0be1caa5d2263 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Oct 2010 16:11:01 -0700 Subject: [PATCH] --- yaml --- r: 220156 b: refs/heads/master c: 364eb72a3965ddf3291be74562081b1c19813473 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/include/linuxver.h | 2 -- trunk/drivers/staging/brcm80211/sys/wl_mac80211.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3ef5a0f397c0..422377ff26ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fff41b2e30c54c35933e6e51f775fe03c73fc572 +refs/heads/master: 364eb72a3965ddf3291be74562081b1c19813473 diff --git a/trunk/drivers/staging/brcm80211/include/linuxver.h b/trunk/drivers/staging/brcm80211/include/linuxver.h index 98768d310ff2..0f8d8af3aa21 100644 --- a/trunk/drivers/staging/brcm80211/include/linuxver.h +++ b/trunk/drivers/staging/brcm80211/include/linuxver.h @@ -34,8 +34,6 @@ #include -#define MY_INIT_WORK(_work, _func) INIT_WORK(_work, _func) - typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs); #include diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c index 98d3e8466e39..88c34fedb936 100644 --- a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -831,7 +831,7 @@ static wl_info_t *wl_attach(uint16 vendor, uint16 device, unsigned long regs, } /* init tx work queue for wl_start/send pkt; no need to destroy workitem */ - MY_INIT_WORK(&wl->txq_task.work, (work_func_t) wl_start_txqwork); + INIT_WORK(&wl->txq_task.work, (work_func_t) wl_start_txqwork); wl->txq_task.context = wl; #endif /* WLC_HIGH_ONLY */ @@ -1670,7 +1670,7 @@ wl_schedule_task(wl_info_t *wl, void (*fn) (struct wl_task *task), return -ENOMEM; } - MY_INIT_WORK(&task->work, (work_func_t) fn); + INIT_WORK(&task->work, (work_func_t) fn); task->context = context; if (!schedule_work(&task->work)) {