diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-24 06:19:30 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-24 06:19:30 +0400 |
| commit | 940917226260d6e029f55742a34a7d7810983c75 (patch) | |
| tree | 871af506fa09aa2717c6c27307838f43993dabaf /include/net/nl802154.h | |
| parent | 9818f660f433b58e770cfeb2ee9566f7b42ca0ae (diff) | |
| parent | 929122cdd5d4c344e59f9b55f870a8fcf7aa0d27 (diff) | |
| download | linux-940917226260d6e029f55742a34a7d7810983c75.tar.xz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'include/net/nl802154.h')
| -rw-r--r-- | include/net/nl802154.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/nl802154.h b/include/net/nl802154.h index e554ecd3727a..99d2ba1c7e03 100644 --- 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, - u8 status, u8 scan_type, u32 unscanned, + u8 status, u8 scan_type, u32 unscanned, u8 page, u8 *edl/*, struct list_head *pan_desc_list */); /** |