diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/linux/connector.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ | |||
| 34 | #define CN_VAL_PROC 0x1 | 34 | #define CN_VAL_PROC 0x1 |
| 35 | #define CN_IDX_CIFS 0x2 | 35 | #define CN_IDX_CIFS 0x2 |
| 36 | #define CN_VAL_CIFS 0x1 | 36 | #define CN_VAL_CIFS 0x1 |
| 37 | #define CN_W1_IDX 0x3 /* w1 communication */ | ||
| 38 | #define CN_W1_VAL 0x1 | ||
| 37 | 39 | ||
| 38 | #define CN_NETLINK_USERS 1 | 40 | |
| 41 | #define CN_NETLINK_USERS 4 | ||
| 39 | 42 | ||
| 40 | /* | 43 | /* |
| 41 | * Maximum connector's message size. | 44 | * Maximum connector's message size. |