diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-26 09:55:10 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-26 09:55:10 -0500 |
| commit | de8fd087b280797977b012a4275ee53ff2999f3f (patch) | |
| tree | 5cd65289983ad65812a6a4335fe657eeb125a7f0 /include/linux/netlink.h | |
| parent | 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 (diff) | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
| download | kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.tar.gz kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.tar.xz kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.zip | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'include/linux/netlink.h')
| -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 2f0c085f2c7..70c2a9dc4b2 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 */ |