diff options
| -rw-r--r-- | drivers/vhost/net.c | 2 | ||||
| -rw-r--r-- | include/linux/miscdevice.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 0f41c9195e9b..df5b6b971f26 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
| @@ -637,7 +637,7 @@ const static struct file_operations vhost_net_fops = { | |||
| 637 | }; | 637 | }; |
| 638 | 638 | ||
| 639 | static struct miscdevice vhost_net_misc = { | 639 | static struct miscdevice vhost_net_misc = { |
| 640 | VHOST_NET_MINOR, | 640 | MISC_DYNAMIC_MINOR, |
| 641 | "vhost-net", | 641 | "vhost-net", |
| 642 | &vhost_net_fops, | 642 | &vhost_net_fops, |
| 643 | }; | 643 | }; |
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index b631c46cffd9..f6c9b7dcb9fd 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -3,6 +3,12 @@ | |||
| 3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 4 | #include <linux/major.h> | 4 | #include <linux/major.h> |
| 5 | 5 | ||
| 6 | /* | ||
| 7 | * These allocations are managed by device@lanana.org. If you use an | ||
| 8 | * entry that is not in assigned your entry may well be moved and | ||
| 9 | * reassigned, or set dynamic if a fixed value is not justified. | ||
| 10 | */ | ||
| 11 | |||
| 6 | #define PSMOUSE_MINOR 1 | 12 | #define PSMOUSE_MINOR 1 |
| 7 | #define MS_BUSMOUSE_MINOR 2 | 13 | #define MS_BUSMOUSE_MINOR 2 |
| 8 | #define ATIXL_BUSMOUSE_MINOR 3 | 14 | #define ATIXL_BUSMOUSE_MINOR 3 |
| @@ -30,7 +36,6 @@ | |||
| 30 | #define HPET_MINOR 228 | 36 | #define HPET_MINOR 228 |
| 31 | #define FUSE_MINOR 229 | 37 | #define FUSE_MINOR 229 |
| 32 | #define KVM_MINOR 232 | 38 | #define KVM_MINOR 232 |
| 33 | #define VHOST_NET_MINOR 233 | ||
| 34 | #define BTRFS_MINOR 234 | 39 | #define BTRFS_MINOR 234 |
| 35 | #define AUTOFS_MINOR 235 | 40 | #define AUTOFS_MINOR 235 |
| 36 | #define MISC_DYNAMIC_MINOR 255 | 41 | #define MISC_DYNAMIC_MINOR 255 |
