Merge with /home/tmlind/src/kernel/linux-2.6

[linux-2.6-omap-h63xx.git] / include / linux / connector.h

diff --git a/include/linux/connector.h b/include/linux/connector.h
index 10eb56b2940ad8c8b7f6775de247d552a99cc6fe..6905ec573921e27a9fbf702e54f169bd862a609b 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -36,9 +36,13 @@
 #define CN_VAL_CIFS                     0x1
 #define CN_W1_IDX                      0x3     /* w1 communication */
 #define CN_W1_VAL                      0x1
+#define CN_IDX_SX1SND                  0x4
+#define CN_VAL_SX1SND                  0x1
+#define CN_IDX_SX1PM                   0x5
+#define CN_VAL_SX1PM                   0x1
 
 
-#define CN_NETLINK_USERS               4
+#define CN_NETLINK_USERS               6
 
 /*
  * Maximum connector's message size.