diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
| commit | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (patch) | |
| tree | aa1a9cc1e79ae66f6cbb0fe39d79a80ca76331e8 /drivers/input/mouse/psmouse.h | |
| parent | c45154a3b1fecdbb51b5462c9f730b44e62b83a5 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/input/mouse/psmouse.h')
| -rw-r--r-- | drivers/input/mouse/psmouse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index 45d2bd774f00..7c4192bd1279 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h | |||
| @@ -36,7 +36,7 @@ typedef enum { | |||
| 36 | 36 | ||
| 37 | struct psmouse { | 37 | struct psmouse { |
| 38 | void *private; | 38 | void *private; |
| 39 | struct input_dev dev; | 39 | struct input_dev *dev; |
| 40 | struct ps2dev ps2dev; | 40 | struct ps2dev ps2dev; |
| 41 | char *vendor; | 41 | char *vendor; |
| 42 | char *name; | 42 | char *name; |