From c6a2c75a1ca7205d62e331391f1e79d151d3ff1b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 19 Aug 2010 09:52:28 -0700 Subject: [PATCH] --- yaml --- r: 210023 b: refs/heads/master c: 8905aaafb4b5d9764c5b4b54c7d03eb41bb0a7e9 h: refs/heads/master i: 210021: 5fa06512d3989b1a1d4cce0be898c130a9bd488f 210019: 98f09098ebaf980897a6b793a1de5e8301be3c17 210015: 6e08dc6e8b3f747c9dc914f6c09b432a60654db3 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/uinput.c | 2 ++ trunk/include/linux/miscdevice.h | 1 + trunk/include/linux/uinput.h | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e78f86e324f4..18fc18ff3ead 100644 --- 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 index bb53fd33cd1c..0d4266a533a5 100644 --- 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 index bafffc737903..18fd13028ba1 100644 --- 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 index 60c81da77f0f..05f7fed2b173 100644 --- 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