diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /include/linux/connector.h | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index 3a14615fd35c..72ba63eb83c5 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
| @@ -43,6 +43,8 @@ | |||
| 43 | #define CN_DST_VAL 0x1 | 43 | #define CN_DST_VAL 0x1 |
| 44 | #define CN_IDX_DM 0x7 /* Device Mapper */ | 44 | #define CN_IDX_DM 0x7 /* Device Mapper */ |
| 45 | #define CN_VAL_DM_USERSPACE_LOG 0x1 | 45 | #define CN_VAL_DM_USERSPACE_LOG 0x1 |
| 46 | #define CN_IDX_DRBD 0x8 | ||
| 47 | #define CN_VAL_DRBD 0x1 | ||
| 46 | 48 | ||
| 47 | #define CN_NETLINK_USERS 8 | 49 | #define CN_NETLINK_USERS 8 |
| 48 | 50 | ||