diff --git a/[refs] b/[refs] index e9178ab00a27..7d3d11bb6011 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6043fcab4b2b06b9fcde4c783ab253cdc2c1129 +refs/heads/master: bb5427b5466782ba0bbf56a4ed752e08b65a5d08 diff --git a/trunk/include/linux/netlink.h b/trunk/include/linux/netlink.h index 87b8a5703ebc..855b44668caa 100644 --- a/trunk/include/linux/netlink.h +++ b/trunk/include/linux/netlink.h @@ -5,7 +5,7 @@ #include #define NETLINK_ROUTE 0 /* Routing/device hook */ -#define NETLINK_W1 1 /* 1-wire subsystem */ +#define NETLINK_UNUSED 1 /* Unused number */ #define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */ #define NETLINK_FIREWALL 3 /* Firewalling hook */ #define NETLINK_INET_DIAG 4 /* INET socket monitoring */