projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-drm-fsl-dcu.git]
/
drivers
/
input
/
serio
/
serio_raw.c
diff --git
a/drivers/input/serio/serio_raw.c
b/drivers/input/serio/serio_raw.c
index 0e343a6cacc9b82a9d4ebbca8f1bdbbfb28b279b..088ebc348ba31da45ddefa6b10a51aabf168185f 100644
(file)
--- a/
drivers/input/serio/serio_raw.c
+++ b/
drivers/input/serio/serio_raw.c
@@
-297,7
+297,7
@@
static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
serio_raw->dev.minor = PSMOUSE_MINOR;
serio_raw->dev.name = serio_raw->name;
- serio_raw->dev.
dev
= &serio->dev;
+ serio_raw->dev.
parent
= &serio->dev;
serio_raw->dev.fops = &serio_raw_fops;
err = misc_register(&serio_raw->dev);