commit 46e07f6e5eb0e465e086b8f485f4238bd453e3e9
author Evgeniy Polyakov <johnpol@2ka.mipt.ru> Mon Apr 03 12:01:12 2006 +0400
committer Greg Kroah-Hartman <gregkh@suse.de> Thu Jun 22 11:22:50 2006 -0700
tree 3ec2810e889f2938ba6811e8c717c1cde2e69eea
parent bb5427b5466782ba0bbf56a4ed752e08b65a5d08

[PATCH] w1: Make w1 connector notifications depend on connector.

Make w1 connector notifications depend on connector.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/w1/w1_netlink.c

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index d48f3ac..d539e09 100644
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -27,7 +27,7 @@
 #include "w1_log.h"
 #include "w1_netlink.h"
 
-#ifndef NETLINK_DISABLED
+#if defined(CONFIG_W1_CON) && (defined(CONFIG_CONNECTOR) || (defined(CONFIG_CONNECTOR_MODULE) && defined(CONFIG_W1_MODULE)))
 void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
 {
 	char buf[sizeof(struct cn_msg) + sizeof(struct w1_netlink_msg)];
@@ -230,8 +230,6 @@
 	cn_del_callback(&w1_id);
 }
 #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)
 {
 }