Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

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

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index b3b9b609ee893741de1df501b588d9c0abb4d110..2a20f488ac1b6fb61d372a6bcfb4aeb781666222 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -23,6 +23,7 @@
 #define NETLINK_GENERIC                16
 /* leave room for NETLINK_DM (DM Events) */
 #define NETLINK_SCSITRANSPORT  18      /* SCSI Transports */
+#define NETLINK_ECRYPTFS       19
 
 #define MAX_LINKS 32