summaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_netlink.c
diff options
context:
space:
mode:
authorEvgeniy Polyakov <johnpol@2ka.mipt.ru>2006-04-03 12:01:12 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-22 11:22:50 -0700
commit46e07f6e5eb0e465e086b8f485f4238bd453e3e9 (patch)
tree3ec2810e889f2938ba6811e8c717c1cde2e69eea /drivers/w1/w1_netlink.c
parentbb5427b5466782ba0bbf56a4ed752e08b65a5d08 (diff)
downloadop-kernel-dev-46e07f6e5eb0e465e086b8f485f4238bd453e3e9.zip
op-kernel-dev-46e07f6e5eb0e465e086b8f485f4238bd453e3e9.tar.gz
[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>
Diffstat (limited to 'drivers/w1/w1_netlink.c')
-rw-r--r--drivers/w1/w1_netlink.c4
1 files changed, 1 insertions, 3 deletions
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 @@ void w1_fini_netlink(void)
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)
{
}
OpenPOWER on IntegriCloud