diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-23 19:19:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-23 19:19:30 -0700 |
| commit | 940917226260d6e029f55742a34a7d7810983c75 (patch) | |
| tree | 871af506fa09aa2717c6c27307838f43993dabaf /include/linux | |
| parent | 9818f660f433b58e770cfeb2ee9566f7b42ca0ae (diff) | |
| parent | 929122cdd5d4c344e59f9b55f870a8fcf7aa0d27 (diff) | |
| download | op-kernel-dev-940917226260d6e029f55742a34a7d7810983c75.zip op-kernel-dev-940917226260d6e029f55742a34a7d7810983c75.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_arp.h | 1 | ||||
| -rw-r--r-- | include/linux/nl802154.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index b554300..282eb37 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -87,7 +87,6 @@ #define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */ #define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */ #define ARPHRD_IEEE802154 804 -#define ARPHRD_IEEE802154_PHY 805 #define ARPHRD_PHONET 820 /* PhoNet media type */ #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */ diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h index 9a1af5f8..b7d9435 100644 --- a/include/linux/nl802154.h +++ b/include/linux/nl802154.h @@ -64,6 +64,8 @@ enum { IEEE802154_ATTR_COORD_REALIGN, IEEE802154_ATTR_SEC, + IEEE802154_ATTR_PAGE, + __IEEE802154_ATTR_MAX, }; |
