Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

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

diff --git a/include/linux/connector.h b/include/linux/connector.h
index b62f823e90cf631537a23ec7e5f17f87c6ce64e9..13fc4541bf235b14333920f35e7ac744c5085bc9 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -36,14 +36,15 @@
 #define CN_VAL_CIFS                     0x1
 #define CN_W1_IDX                      0x3     /* w1 communication */
 #define CN_W1_VAL                      0x1
+#define CN_IDX_V86D                    0x4
+#define CN_VAL_V86D_UVESAFB            0x1
 
-
-#define CN_NETLINK_USERS               4
+#define CN_NETLINK_USERS               5
 
 /*
  * Maximum connector's message size.
  */
-#define CONNECTOR_MAX_MSG_SIZE         1024
+#define CONNECTOR_MAX_MSG_SIZE         16384
 
 /*
  * idx and val are unique identifiers which