Browse Source

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

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Evgeniy Polyakov 19 years ago
parent
commit
b6043fcab4
2 changed files with 4 additions and 4 deletions
  1. 0 3
      drivers/w1/w1_netlink.h
  2. 4 1
      include/linux/connector.h

+ 0 - 3
drivers/w1/w1_netlink.h

@@ -27,9 +27,6 @@
 
 
 #include "w1.h"
 #include "w1.h"
 
 
-#define CN_W1_IDX	3
-#define CN_W1_VAL	1
-
 enum w1_netlink_message_types {
 enum w1_netlink_message_types {
 	W1_SLAVE_ADD = 0,
 	W1_SLAVE_ADD = 0,
 	W1_SLAVE_REMOVE,
 	W1_SLAVE_REMOVE,

+ 4 - 1
include/linux/connector.h

@@ -34,8 +34,11 @@
 #define CN_VAL_PROC			0x1
 #define CN_VAL_PROC			0x1
 #define CN_IDX_CIFS			0x2
 #define CN_IDX_CIFS			0x2
 #define CN_VAL_CIFS                     0x1
 #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.
  * Maximum connector's message size.