aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/uhid.c3
-rw-r--r--include/linux/miscdevice.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index 9ab7dfc6c72c..145a4cb5c872 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -640,7 +640,7 @@ static const struct file_operations uhid_fops = {
640 640
641static struct miscdevice uhid_misc = { 641static struct miscdevice uhid_misc = {
642 .fops = &uhid_fops, 642 .fops = &uhid_fops,
643 .minor = MISC_DYNAMIC_MINOR, 643 .minor = UHID_MINOR,
644 .name = UHID_NAME, 644 .name = UHID_NAME,
645}; 645};
646 646
@@ -659,4 +659,5 @@ module_exit(uhid_exit);
659MODULE_LICENSE("GPL"); 659MODULE_LICENSE("GPL");
660MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); 660MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>");
661MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem"); 661MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem");
662MODULE_ALIAS_MISCDEV(UHID_MINOR);
662MODULE_ALIAS("devname:" UHID_NAME); 663MODULE_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
50struct device; 51struct device;