diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
| commit | 34161db6b14d984fb9b06c735b7b42f8803f6851 (patch) | |
| tree | 99656278b6697f1cde5b05894b7c0ee22c63a00e /include/net/ieee80211softmac.h | |
| parent | 5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Conflicts:
include/linux/sunrpc/xprt.h
net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
Diffstat (limited to 'include/net/ieee80211softmac.h')
| -rw-r--r-- | include/net/ieee80211softmac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index 617b672b1132..89119277553d 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h | |||
| @@ -108,8 +108,8 @@ struct ieee80211softmac_assoc_info { | |||
| 108 | /* Scan retries remaining */ | 108 | /* Scan retries remaining */ |
| 109 | int scan_retry; | 109 | int scan_retry; |
| 110 | 110 | ||
| 111 | struct work_struct work; | 111 | struct delayed_work work; |
| 112 | struct work_struct timeout; | 112 | struct delayed_work timeout; |
| 113 | }; | 113 | }; |
| 114 | 114 | ||
| 115 | struct ieee80211softmac_bss_info { | 115 | struct ieee80211softmac_bss_info { |