Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
This commit is contained in:
@@ -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"
|
||||
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/list.h>
|
||||
#include <net/sock.h>
|
||||
#include <net/ieee802154/af_ieee802154.h>
|
||||
#include <net/ieee802154/mac_def.h>
|
||||
#include <net/ieee802154/netdevice.h>
|
||||
#include <net/af_ieee802154.h>
|
||||
#include <net/ieee802154.h>
|
||||
#include <net/ieee802154_netdev.h>
|
||||
|
||||
#include <asm/ioctls.h>
|
||||
|
||||
|
||||
@@ -27,9 +27,9 @@
|
||||
#include <net/netlink.h>
|
||||
#include <net/genetlink.h>
|
||||
#include <linux/nl802154.h>
|
||||
#include <net/ieee802154/af_ieee802154.h>
|
||||
#include <net/ieee802154/nl802154.h>
|
||||
#include <net/ieee802154/netdevice.h>
|
||||
#include <net/af_ieee802154.h>
|
||||
#include <net/nl802154.h>
|
||||
#include <net/ieee802154_netdev.h>
|
||||
|
||||
static unsigned int ieee802154_seq_num;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/list.h>
|
||||
#include <net/sock.h>
|
||||
#include <net/ieee802154/af_ieee802154.h>
|
||||
#include <net/af_ieee802154.h>
|
||||
|
||||
#include "af802154.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user