diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /drivers/input/misc/uinput.c | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'drivers/input/misc/uinput.c')
| -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 bb53fd33cd1..0d4266a533a 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 | { |