Merge branch 'topic/atmel' into for-linus

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

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index c9609f9aedac6666ec0525f6c4b8d2fbd74a6fbb..ee5e3c9e2bcaf0006b6b03f659cc6d323c15f3bb 100644 (file)
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -23,6 +23,8 @@
 #ifndef LINUX_PHONET_H
 #define LINUX_PHONET_H
 
+#include <linux/types.h>
+
 /* Automatic protocol selection */
 #define PN_PROTO_TRANSPORT     0
 /* Phonet datagram socket */
@@ -72,6 +74,7 @@ struct phonetmsg {
        } pn_msg_u;
 };
 #define PN_COMMON_MESSAGE      0xF0
+#define PN_COMMGR              0x10
 #define PN_PREFIX              0xE0 /* resource for extended messages */
 #define pn_submsg_id           pn_msg_u.base.pn_submsg_id
 #define pn_e_submsg_id         pn_msg_u.ext.pn_e_submsg_id