diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 21:18:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 21:18:17 -0800 |
commit | d20e6336ea4250e51081e4b2924b9ef4dfa45909 (patch) | |
tree | 96c22694bec10912d40a3700a945157597dd901b /drivers/input/mouse | |
parent | fa3c791d85aa9a363dd72dd834b73b79252ef44e (diff) | |
parent | 6dea93477c3377cf4199fd37cc3fb11071987ae4 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 7665fd9ce559..19b1b0121726 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -403,6 +403,7 @@ static int genius_detect(struct psmouse *psmouse, int set_properties) set_bit(REL_WHEEL, psmouse->dev->relbit); psmouse->vendor = "Genius"; + psmouse->name = "Mouse"; psmouse->pktsize = 4; } |