This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / w1 / w1_netlink.c

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index 2a82fb0..df9d3e7 100644 (file)
--- 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