git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[safe/jmp/linux-2.6]
/
include
/
net
/
nl802154.h
diff --git
a/include/net/nl802154.h
b/include/net/nl802154.h
index
e554ecd
..
99d2ba1
100644
(file)
--- a/
include/net/nl802154.h
+++ b/
include/net/nl802154.h
@@
-95,7
+95,7
@@
int ieee802154_nl_disassoc_confirm(struct net_device *dev,
* Note: This API does not permit the return of an active scan result.
*/
int ieee802154_nl_scan_confirm(struct net_device *dev,
* Note: This API does not permit the return of an active scan result.
*/
int ieee802154_nl_scan_confirm(struct net_device *dev,
- u8 status, u8 scan_type, u32 unscanned,
+ u8 status, u8 scan_type, u32 unscanned,
u8 page,
u8 *edl/*, struct list_head *pan_desc_list */);
/**
u8 *edl/*, struct list_head *pan_desc_list */);
/**