diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-25 03:39:30 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-25 03:39:30 (GMT) |
| commit | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (patch) | |
| tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /include | |
| parent | e89227889cec6b66758b44c83f78dba337e5d699 (diff) | |
| parent | 7686ee1ad976efeddf10583f013462c66408ae51 (diff) | |
| download | linux-fsl-qoriq-6b6a93c6876ea1c530d5d3f68e3678093a27fab0.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 2f0c085..70c2a9d 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -5,7 +5,7 @@ #include <linux/types.h> #define NETLINK_ROUTE 0 /* Routing/device hook */ -#define NETLINK_SKIP 1 /* Reserved for ENskip */ +#define NETLINK_W1 1 /* 1-wire subsystem */ #define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */ #define NETLINK_FIREWALL 3 /* Firewalling hook */ #define NETLINK_TCPDIAG 4 /* TCP socket monitoring */ |