diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-27 14:29:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-27 14:29:31 -0400 |
commit | f004ec728bff3cf924ffc19387baca503cd73b01 (patch) | |
tree | d70d86b6697002cf4d71642185003d5e1bbf16f5 /net/ieee802154/raw.c | |
parent | c685bfc6c6bcb9bcc42d1345a3650d3ce5185c52 (diff) | |
parent | 987b8816661332978efd0f85bedf9866fe2e3232 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'net/ieee802154/raw.c')
-rw-r--r-- | net/ieee802154/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index fca44d59f97e..ea8d1f15206e 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/if_arp.h> | 26 | #include <linux/if_arp.h> |
27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
28 | #include <net/sock.h> | 28 | #include <net/sock.h> |
29 | #include <net/ieee802154/af_ieee802154.h> | 29 | #include <net/af_ieee802154.h> |
30 | 30 | ||
31 | #include "af802154.h" | 31 | #include "af802154.h" |
32 | 32 | ||