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 14ceebf..f6c9b7d 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -3,48 +3,58 @@
 #include <linux/module.h>
 #include <linux/major.h>
 
-#define PSMOUSE_MINOR  1
-#define MS_BUSMOUSE_MINOR 2
-#define ATIXL_BUSMOUSE_MINOR 3
-/*#define AMIGAMOUSE_MINOR 4   FIXME OBSOLETE */
-#define ATARIMOUSE_MINOR 5
-#define SUN_MOUSE_MINOR 6
-#define APOLLO_MOUSE_MINOR 7
-#define PC110PAD_MINOR 9
-/*#define ADB_MOUSE_MINOR 10   FIXME OBSOLETE */
+/*
+ *     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 AMIGAMOUSE_MINOR     4       FIXME OBSOLETE */
+#define ATARIMOUSE_MINOR       5
+#define SUN_MOUSE_MINOR                6
+#define APOLLO_MOUSE_MINOR     7
+#define PC110PAD_MINOR         9
+/*#define ADB_MOUSE_MINOR      10      FIXME OBSOLETE */
 #define WATCHDOG_MINOR         130     /* Watchdog timer     */
 #define TEMP_MINOR             131     /* Temperature Sensor */
-#define RTC_MINOR 135
+#define RTC_MINOR              135
 #define EFI_RTC_MINOR          136     /* EFI Time services */
-#define SUN_OPENPROM_MINOR 139
+#define SUN_OPENPROM_MINOR     139
 #define DMAPI_MINOR            140     /* DMAPI */
-#define NVRAM_MINOR 144
-#define SGI_MMTIMER        153
+#define NVRAM_MINOR            144
+#define SGI_MMTIMER            153
 #define STORE_QUEUE_MINOR      155
-#define I2O_MINOR 166
+#define I2O_MINOR              166
 #define MICROCODE_MINOR                184
-#define MWAVE_MINOR    219             /* ACP/Mwave Modem */
-#define MPT_MINOR      220
-#define MISC_DYNAMIC_MINOR 255
-
-#define TUN_MINOR           200
-#define        HPET_MINOR           228
+#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 BTRFS_MINOR            234
+#define AUTOFS_MINOR           235
+#define MISC_DYNAMIC_MINOR     255
 
 struct device;
-struct class_device;
 
 struct miscdevice  {
        int minor;
        const char *name;
-       struct file_operations *fops;
+       const struct file_operations *fops;
        struct list_head list;
-       struct device *dev;
-       struct class_device *class;
-       char devfs_name[64];
+       struct device *parent;
+       struct device *this_device;
+       const char *nodename;
+       mode_t mode;
 };
 
 extern int misc_register(struct miscdevice * misc);
-extern int misc_deregister(struct miscdevice * misc);
+extern int misc_deregister(struct miscdevice *misc);
 
 #define MODULE_ALIAS_MISCDEV(minor)                            \
        MODULE_ALIAS("char-major-" __stringify(MISC_MAJOR)      \