diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-16 21:25:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-16 21:25:03 -0800 |
| commit | bb89c58c186082eb7918c67e6ef3b98ffdff24dc (patch) | |
| tree | a678df98cea946893713f967bd8d1b28c97609e3 /drivers/input | |
| parent | 5d4bd9bbb6302254c95305443b70649366ef957e (diff) | |
| parent | c90176df2c76e59abadb187368f15f3cde133dbc (diff) | |
Merge http://linux-sound.bkbits.net/linux-sound
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/input.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/sa1111ps2.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index fdfe4150aafa..30796fc98f74 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -383,7 +383,7 @@ static void input_call_hotplug(char *verb, struct input_dev *dev) argv[0], argv[1], envp[0], envp[1], envp[2], envp[3], envp[4]); #endif - value = call_usermodehelper(argv [0], argv, envp); + value = call_usermodehelper(argv [0], argv, envp, 0); kfree(buf); kfree(envp); diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c index df3466ca660d..f4c69da7c7bd 100644 --- a/drivers/input/serio/sa1111ps2.c +++ b/drivers/input/serio/sa1111ps2.c @@ -9,6 +9,7 @@ */ #include <linux/module.h> #include <linux/init.h> +#include <linux/input.h> #include <linux/serio.h> #include <linux/errno.h> #include <linux/interrupt.h> @@ -339,6 +340,7 @@ static struct sa1111_driver ps2_driver = { .drv = { .name = "sa1111-ps2", .bus = &sa1111_bus_type, + .devclass = &input_devclass, .probe = ps2_probe, .remove = ps2_remove, .suspend = ps2_suspend, |