---

yaml --- r: 172971 b: refs/heads/master c: 35a8a3f h: refs/heads/master i: 172969: 37307e4 172967: e2fecbe v: v3
git-mirror · Nov 25, 2009 · c680783 · c680783
1 parent 8aac766
commit c680783
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad85dfe67bbf13d5fa20764e4ce801a1e6e526d8
+refs/heads/master: 35a8a3fdcd4f973a5430e868f2f2a5c363803a5b
diff --git a/trunk/include/linux/connector.h b/trunk/include/linux/connector.h
@@ -43,6 +43,8 @@
 #define CN_DST_VAL			0x1
 #define CN_IDX_DM			0x7	/* Device Mapper */
 #define CN_VAL_DM_USERSPACE_LOG		0x1
+#define CN_IDX_DRBD			0x8
+#define CN_VAL_DRBD			0x1
 
 #define CN_NETLINK_USERS		8
 

diff --git a/trunk/include/linux/drbd.h b/trunk/include/linux/drbd.h
@@ -322,13 +322,6 @@ enum drbd_timeout_flag {
 #define DRBD_NL_CREATE_DEVICE 0x01
 #define DRBD_NL_SET_DEFAULTS  0x02
 
-/* The following line should be moved over to linux/connector.h
- * when the time comes */
-#ifndef CN_IDX_DRBD
-# define CN_IDX_DRBD			0x4
-/* Ubuntu "intrepid ibex" release defined CN_IDX_DRBD as 0x6 */
-#endif
-#define CN_VAL_DRBD			0x1
 
 /* For searching a vacant cn_idx value */
 #define CN_IDX_STEP			6977