diff options
| author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2006-03-23 19:11:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-22 11:22:50 -0700 |
| commit | b6043fcab4b2b06b9fcde4c783ab253cdc2c1129 (patch) | |
| tree | fd89df381e6d0beabf41f11be5fdc2b7bfe941d6 | |
| parent | 12003375acd879e498c6c511faf27531296f9640 (diff) | |
| download | talos-op-linux-b6043fcab4b2b06b9fcde4c783ab253cdc2c1129.tar.gz talos-op-linux-b6043fcab4b2b06b9fcde4c783ab253cdc2c1129.zip | |
[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>
| -rw-r--r-- | drivers/w1/w1_netlink.h | 3 | ||||
| -rw-r--r-- | 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 5644221f9a44..56122b9e9294 100644 --- a/drivers/w1/w1_netlink.h +++ b/drivers/w1/w1_netlink.h @@ -27,9 +27,6 @@ #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 ad1a22c1c42e..4c02119c6ab9 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h @@ -34,8 +34,11 @@ #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. |
