X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fw1%2Fw1_netlink.c;h=df9d3e732c0b7cc44f646efee28e13d01638a08b;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=2a82fb055c70bfb2ef4a25dff024da1c681bbd13;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index 2a82fb055..df9d3e732 100644
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -26,7 +26,6 @@
 #include "w1_log.h"
 #include "w1_netlink.h"
 
-#ifndef NETLINK_DISABLED
 void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
 {
 	unsigned int size;
@@ -34,9 +33,6 @@ void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
 	struct w1_netlink_msg *data;
 	struct nlmsghdr *nlh;
 
-	if (!dev->nls)
-		return;
-
 	size = NLMSG_SPACE(sizeof(struct w1_netlink_msg));
 
 	skb = alloc_skb(size, GFP_ATOMIC);
@@ -57,10 +53,3 @@ void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
 nlmsg_failure:
 	return;
 }
-#else
-#warning Netlink support is disabled. Please compile with NET support enabled.
-
-void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
-{
-}
-#endif