Merge mainline v2.6.27-rc2 tree into linux-omap tree

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

diff --git a/include/linux/connector.h b/include/linux/connector.h
index fd722f3cb6bd362320b12f191e2e81a19380a602..4c3cb6d77de8dc6e201fc9194bdefad9bba1aec4 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -40,8 +40,9 @@
 #define CN_VAL_SX1SND                  0x1
 #define CN_IDX_V86D                    0x4
 #define CN_VAL_V86D_UVESAFB            0x1
+#define CN_IDX_BB                      0x5     /* BlackBoard, from the TSP GPL sampling framework */
 
-#define CN_NETLINK_USERS               5
+#define CN_NETLINK_USERS               6
 
 /*
  * Maximum connector's message size.