[PATCH 4/14] [PATCH] w1: Move w1-connector definitions into linux/include/connector.h

Greg KH
2006-06-22T18:35:19Z

drivers/w1/w1_netlink.h | 3 ---
include/linux/connector.h | 5 ++++-
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
index 5644221..56122b9 100644
--- a/drivers/w1/w1_netlink.h
+++ b/drivers/w1/w1_netlink.h
@@ -27,9 +27,6 @@ #include <linux/connector.h>

#include "w1.h"

-#define CN_W1_IDX 3
-#define CN_W1_VAL 1
-
enum w1_netlink_message_types {
W1_SLAVE_ADD = 0,
W1_SLAVE_REMOVE,
diff --git a/include/linux/connector.h b/include/linux/connector.h
index ad1a22c..4c02119 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -34,8 +34,11 @@ #define CN_IDX_PROC 0x1
#define CN_VAL_PROC 0x1
#define CN_IDX_CIFS 0x2
#define CN_VAL_CIFS 0x1
+#define CN_W1_IDX 0x3 /* w1 communication */
+#define CN_W1_VAL 0x1

-#define CN_NETLINK_USERS 1
+
+#define CN_NETLINK_USERS 4

/*
* Maximum connector's message size.
--
1.4.0