Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / include / linux / miscdevice.h

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index c41d7270c6c6e681eae994ce60b5b9b013c6492c..0549d2115507124405b06f5ea96f072880a3e475 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -42,6 +42,7 @@
 #define AUTOFS_MINOR           235
 #define MAPPER_CTRL_MINOR      236
 #define LOOP_CTRL_MINOR                237
+#define VHOST_NET_MINOR                238
 #define MISC_DYNAMIC_MINOR     255
 
 struct device;
@@ -54,7 +55,7 @@ struct miscdevice  {
        struct device *parent;
        struct device *this_device;
        const char *nodename;
-       mode_t mode;
+       umode_t mode;
 };
 
 extern int misc_register(struct miscdevice * misc);