diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 12:48:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 12:48:34 -0400 |
| commit | e0d7ff168a71299919f01500b3d507aae0c67513 (patch) | |
| tree | de2a7807ec5642e7389191e66d8c5d6d1249096a /drivers/input/serio/serio_raw.c | |
| parent | ca49a601c2b4b74e5cf57fef62122204d1982372 (diff) | |
| parent | 33fdfa97f2b3aab698ef849ec50dcc5102017f0a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/serio/serio_raw.c')
| -rw-r--r-- | drivers/input/serio/serio_raw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index d914e7e93db4..47e08de18d07 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c | |||
| @@ -299,6 +299,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv) | |||
| 299 | 299 | ||
| 300 | serio_raw->dev.minor = PSMOUSE_MINOR; | 300 | serio_raw->dev.minor = PSMOUSE_MINOR; |
| 301 | serio_raw->dev.name = serio_raw->name; | 301 | serio_raw->dev.name = serio_raw->name; |
| 302 | serio_raw->dev.dev = &serio->dev; | ||
| 302 | serio_raw->dev.fops = &serio_raw_fops; | 303 | serio_raw->dev.fops = &serio_raw_fops; |
| 303 | 304 | ||
| 304 | err = misc_register(&serio_raw->dev); | 305 | err = misc_register(&serio_raw->dev); |