diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 11:27:20 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 11:27:28 -0400 |
| commit | 37eca0d64a2dbeece25969ec0698e1ff72bdcf39 (patch) | |
| tree | 54ba70f0428f586f4fe28d8b429b9f9e0799a17a /drivers/input/misc | |
| parent | 277b199800ac90811ac86d215063df1984f51619 (diff) | |
| parent | 3c06806e690885ce978ef180c8f8b6f8c17fb4b4 (diff) | |
Merge branch 'linus' into core/locking
Reason: Pull in the semaphore related changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/uinput.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index bb53fd33cd1c..0d4266a533a5 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c | |||
| @@ -811,6 +811,8 @@ static struct miscdevice uinput_misc = { | |||
| 811 | .minor = UINPUT_MINOR, | 811 | .minor = UINPUT_MINOR, |
| 812 | .name = UINPUT_NAME, | 812 | .name = UINPUT_NAME, |
| 813 | }; | 813 | }; |
| 814 | MODULE_ALIAS_MISCDEV(UINPUT_MINOR); | ||
| 815 | MODULE_ALIAS("devname:" UINPUT_NAME); | ||
| 814 | 816 | ||
| 815 | static int __init uinput_init(void) | 817 | static int __init uinput_init(void) |
| 816 | { | 818 | { |