diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-07 22:45:40 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 22:45:40 +0200 |
| commit | b37e3b6d64358604960b35e8ecbb7aed22e0926e (patch) | |
| tree | f9673afc2332c15a989d3b32f002363a92ea66e1 /drivers/net/wireless/zd1211rw/zd_usb.h | |
| parent | cfg80211: add a timer for invalid user reg hints (diff) | |
| parent | ath: add missing regdomain pair 0x5c mapping (diff) | |
| download | linux-b37e3b6d64358604960b35e8ecbb7aed22e0926e.tar.xz linux-b37e3b6d64358604960b35e8ecbb7aed22e0926e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
net/bluetooth/mgmt.c
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_usb.h')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h index 3924258ce177..bf942843b733 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.h +++ b/drivers/net/wireless/zd1211rw/zd_usb.h @@ -183,6 +183,7 @@ struct zd_usb_rx { spinlock_t lock; struct mutex setup_mutex; struct delayed_work idle_work; + struct tasklet_struct reset_timer_tasklet; u8 fragment[2 * USB_MAX_RX_SIZE]; unsigned int fragment_length; unsigned int usb_packet_size; |