projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull battery into release branch
[powerpc.git]
/
include
/
net
/
ieee80211softmac.h
diff --git
a/include/net/ieee80211softmac.h
b/include/net/ieee80211softmac.h
index
617b672
..
8911927
100644
(file)
--- a/
include/net/ieee80211softmac.h
+++ b/
include/net/ieee80211softmac.h
@@
-108,8
+108,8
@@
struct ieee80211softmac_assoc_info {
/* Scan retries remaining */
int scan_retry;
- struct
work_struct
work;
- struct
work_struct
timeout;
+ struct
delayed_work
work;
+ struct
delayed_work
timeout;
};
struct ieee80211softmac_bss_info {