1 files changed, 1 insertions, 55 deletions

diff --git a/include/linux/connector.h b/include/linux/connector.h
index 76384074262d..b2b5a41b6a24 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -18,63 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __CONNECTOR_H
 #define __CONNECTOR_H
 
-#include <linux/types.h>
-
-/*
- * Process Events connector unique ids -- used for message routing
- */
-#define CN_IDX_PROC                     0x1
-#define CN_VAL_PROC                     0x1
-#define CN_IDX_CIFS                     0x2
-#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_IDX_BB                       0x5     /* BlackBoard, from the TSP GPL sampling framework */
-#define CN_DST_IDX                      0x6
-#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_KVP_IDX                      0x9     /* HyperV KVP */
-#define CN_KVP_VAL                      0x1     /* queries from the kernel */
-
-#define CN_NETLINK_USERS                10      /* Highest index + 1 */
-
-/*
- * Maximum connector's message size.
- */
-#define CONNECTOR_MAX_MSG_SIZE          16384
-
-/*
- * idx and val are unique identifiers which 
- * are used for message routing and 
- * must be registered in connector.h for in-kernel usage.
- */
-
-struct cb_id {
-        __u32 idx;
-        __u32 val;
-};
-
-struct cn_msg {
-        struct cb_id id;
-
-        __u32 seq;
-        __u32 ack;
-
-        __u16 len;              /* Length of the following data */
-        __u16 flags;
-        __u8 data[0];
-};
-
-#ifdef __KERNEL__
 
 #include <linux/atomic.h>
 
@@ -82,6 +28,7 @@ struct cn_msg {
 #include <linux/workqueue.h>
 
 #include <net/sock.h>
+#include <uapi/linux/connector.h>
 
 #define CN_CBQ_NAMELEN          32
 
@@ -137,5 +84,4 @@ void cn_queue_free_dev(struct cn_queue_dev *dev);
 
 int cn_cb_equal(struct cb_id *, struct cb_id *);
 
-#endif                          /* __KERNEL__ */
 #endif                          /* __CONNECTOR_H */