Merge current mainline 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 e2729f97ca778c3b30b66d2b12e8c0cdddd1f8b6..70817a9968be20bba98670e3d1332141217901a0 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -36,9 +36,12 @@
 #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_V86D                    0x4
+#define CN_VAL_V86D_UVESAFB            0x1
 
-
-#define CN_NETLINK_USERS               4
+#define CN_NETLINK_USERS               5
 
 /*
  * Maximum connector's message size.
@@ -111,7 +114,6 @@ struct cn_queue_dev {
        struct list_head queue_list;
        spinlock_t queue_lock;
 
-       int netlink_groups;
        struct sock *nls;
 };
 
@@ -132,15 +134,13 @@ struct cn_callback_data {
 
 struct cn_callback_entry {
        struct list_head callback_entry;
-       struct cn_callback *cb;
        struct work_struct work;
        struct cn_queue_dev *pdev;
 
        struct cn_callback_id id;
        struct cn_callback_data data;
 
-       int seq, group;
-       struct sock *nls;
+       u32 seq, group;
 };
 
 struct cn_ctl_entry {