diff options
| -rw-r--r-- | drivers/hid/uhid.c | 3 | ||||
| -rw-r--r-- | include/linux/miscdevice.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c index 5bf2fb785844..93b00d76374c 100644 --- a/drivers/hid/uhid.c +++ b/drivers/hid/uhid.c | |||
| @@ -615,7 +615,7 @@ static const struct file_operations uhid_fops = { | |||
| 615 | 615 | ||
| 616 | static struct miscdevice uhid_misc = { | 616 | static struct miscdevice uhid_misc = { |
| 617 | .fops = &uhid_fops, | 617 | .fops = &uhid_fops, |
| 618 | .minor = MISC_DYNAMIC_MINOR, | 618 | .minor = UHID_MINOR, |
| 619 | .name = UHID_NAME, | 619 | .name = UHID_NAME, |
| 620 | }; | 620 | }; |
| 621 | 621 | ||
| @@ -634,4 +634,5 @@ module_exit(uhid_exit); | |||
| 634 | MODULE_LICENSE("GPL"); | 634 | MODULE_LICENSE("GPL"); |
| 635 | MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); | 635 | MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); |
| 636 | MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem"); | 636 | MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem"); |
| 637 | MODULE_ALIAS_MISCDEV(UHID_MINOR); | ||
| 637 | MODULE_ALIAS("devname:" UHID_NAME); | 638 | MODULE_ALIAS("devname:" UHID_NAME); |
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 09c2300ddb37..cb358355ef43 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #define MAPPER_CTRL_MINOR 236 | 45 | #define MAPPER_CTRL_MINOR 236 |
| 46 | #define LOOP_CTRL_MINOR 237 | 46 | #define LOOP_CTRL_MINOR 237 |
| 47 | #define VHOST_NET_MINOR 238 | 47 | #define VHOST_NET_MINOR 238 |
| 48 | #define UHID_MINOR 239 | ||
| 48 | #define MISC_DYNAMIC_MINOR 255 | 49 | #define MISC_DYNAMIC_MINOR 255 |
| 49 | 50 | ||
| 50 | struct device; | 51 | struct device; |
