diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 11:06:26 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 11:06:26 +0400 |
| commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
| tree | 8b639000418e2756bf6baece4e00e07d2534bccc /drivers/misc/iwmc3200top/iwmc3200top.h | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) | |
| download | linux-b73077eb03f510a84b102fb97640e595a958403c.tar.xz | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/misc/iwmc3200top/iwmc3200top.h')
| -rw-r--r-- | drivers/misc/iwmc3200top/iwmc3200top.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/iwmc3200top/iwmc3200top.h b/drivers/misc/iwmc3200top/iwmc3200top.h index 740ff0738ea8..620973ed8bf9 100644 --- a/drivers/misc/iwmc3200top/iwmc3200top.h +++ b/drivers/misc/iwmc3200top/iwmc3200top.h @@ -183,9 +183,7 @@ struct iwmct_priv { u32 barker; struct iwmct_dbg dbg; - /* drivers work queue */ - struct workqueue_struct *wq; - struct workqueue_struct *bus_rescan_wq; + /* drivers work items */ struct work_struct bus_rescan_worker; struct work_struct isr_worker; |