diff options
author | David S. Miller | 2009-07-27 20:29:31 +0200 |
---|---|---|
committer | David S. Miller | 2009-07-27 20:29:31 +0200 |
commit | f004ec728bff3cf924ffc19387baca503cd73b01 (patch) | |
tree | d70d86b6697002cf4d71642185003d5e1bbf16f5 /net/ieee802154/af_ieee802154.c | |
parent | netxen: update version to 4.0.41 (diff) | |
parent | trivial: fix typo in ieee802154 documentation and add it to index (diff) | |
download | kernel-qcow2-linux-f004ec728bff3cf924ffc19387baca503cd73b01.tar.gz kernel-qcow2-linux-f004ec728bff3cf924ffc19387baca503cd73b01.tar.xz kernel-qcow2-linux-f004ec728bff3cf924ffc19387baca503cd73b01.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'net/ieee802154/af_ieee802154.c')
-rw-r--r-- | net/ieee802154/af_ieee802154.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index 3bb6bdb1dac1..69c8d9207aa7 100644 --- a/net/ieee802154/af_ieee802154.c +++ b/net/ieee802154/af_ieee802154.c @@ -34,8 +34,8 @@ #include <net/tcp_states.h> #include <net/route.h> -#include <net/ieee802154/af_ieee802154.h> -#include <net/ieee802154/netdevice.h> +#include <net/af_ieee802154.h> +#include <net/ieee802154_netdev.h> #include "af802154.h" |