misc: Fix allocation 'borrowed' by vhost_net

[safe/jmp/linux-2.6] / include / linux / miscdevice.h

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index a820f81..f6c9b7d 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -3,6 +3,12 @@
 #include <linux/module.h>
 #include <linux/major.h>
 
 #include <linux/module.h>
 #include <linux/major.h>
 

+/*
+ *     These allocations are managed by device@lanana.org. If you use an
+ *     entry that is not in assigned your entry may well be moved and
+ *     reassigned, or set dynamic if a fixed value is not justified.
+ */
+

 #define PSMOUSE_MINOR          1
 #define MS_BUSMOUSE_MINOR      2
 #define ATIXL_BUSMOUSE_MINOR   3
 #define PSMOUSE_MINOR          1
 #define MS_BUSMOUSE_MINOR      2
 #define ATIXL_BUSMOUSE_MINOR   3


@@ -26,9 +32,12 @@
 #define TUN_MINOR              200
 #define MWAVE_MINOR            219     /* ACP/Mwave Modem */
 #define MPT_MINOR              220
 #define TUN_MINOR              200
 #define MWAVE_MINOR            219     /* ACP/Mwave Modem */
 #define MPT_MINOR              220

+#define MPT2SAS_MINOR          221

 #define HPET_MINOR             228
 #define FUSE_MINOR             229
 #define KVM_MINOR              232
 #define HPET_MINOR             228
 #define FUSE_MINOR             229
 #define KVM_MINOR              232

+#define BTRFS_MINOR            234
+#define AUTOFS_MINOR           235

 #define MISC_DYNAMIC_MINOR     255
 
 struct device;
 #define MISC_DYNAMIC_MINOR     255
 
 struct device;


@@ -40,6 +49,8 @@ struct miscdevice  {
        struct list_head list;
        struct device *parent;
        struct device *this_device;
        struct list_head list;
        struct device *parent;
        struct device *this_device;

+       const char *nodename;
+       mode_t mode;

 };
 
 extern int misc_register(struct miscdevice * misc);
 };
 
 extern int misc_register(struct miscdevice * misc);