---

yaml --- r: 210023 b: refs/heads/master c: 8905aaa h: refs/heads/master i: 210021: 5fa0651 210019: 98f0909 210015: 6e08dc6 v: v3
git-mirror · Aug 21, 2010 · c6a2c75 · c6a2c75
1 parent 35030fe
commit c6a2c75
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77edf0c7515cd8268a0cce2daa3f3c87e9afe005
+refs/heads/master: 8905aaafb4b5d9764c5b4b54c7d03eb41bb0a7e9
diff --git a/trunk/drivers/input/misc/uinput.c b/trunk/drivers/input/misc/uinput.c
@@ -811,6 +811,8 @@ static struct miscdevice uinput_misc = {
 	.minor		= UINPUT_MINOR,
 	.name		= UINPUT_NAME,
 };
+MODULE_ALIAS_MISCDEV(UINPUT_MINOR);
+MODULE_ALIAS("devname:" UINPUT_NAME);
 
 static int __init uinput_init(void)
 {

diff --git a/trunk/include/linux/miscdevice.h b/trunk/include/linux/miscdevice.h
@@ -33,6 +33,7 @@
 #define MWAVE_MINOR		219	/* ACP/Mwave Modem */
 #define MPT_MINOR		220
 #define MPT2SAS_MINOR		221
+#define UINPUT_MINOR		223
 #define HPET_MINOR		228
 #define FUSE_MINOR		229
 #define KVM_MINOR		232

diff --git a/trunk/include/linux/uinput.h b/trunk/include/linux/uinput.h
@@ -37,7 +37,6 @@
 #define UINPUT_VERSION		3
 
 #ifdef __KERNEL__
-#define UINPUT_MINOR		223
 #define UINPUT_NAME		"uinput"
 #define UINPUT_BUFFER_SIZE	16
 #define UINPUT_NUM_REQUESTS	16