diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/connector.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
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 | ||