nsproxy: remove INIT_NSPROXY()

[safe/jmp/linux-2.6] / include / linux / if_arp.h

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index b554300..e80b7f8 100644 (file)
--- 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           */
@@ -134,8 +133,7 @@ struct arpreq_old {
  *     This structure defines an ethernet arp header.
  */
 
-struct arphdr
-{
+struct arphdr {
        __be16          ar_hrd;         /* format of hardware address   */
        __be16          ar_pro;         /* format of protocol address   */
        unsigned char   ar_hln;         /* length of hardware address   */