diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /drivers/input/mouse/hgpk.c | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'drivers/input/mouse/hgpk.c')
| -rw-r--r-- | drivers/input/mouse/hgpk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c index 29dc6aade766..9169d1591c1f 100644 --- a/drivers/input/mouse/hgpk.c +++ b/drivers/input/mouse/hgpk.c | |||
| @@ -423,7 +423,6 @@ static void hgpk_recalib_work(struct work_struct *work) | |||
| 423 | 423 | ||
| 424 | static int hgpk_register(struct psmouse *psmouse) | 424 | static int hgpk_register(struct psmouse *psmouse) |
| 425 | { | 425 | { |
| 426 | struct input_dev *dev = psmouse->dev; | ||
| 427 | int err; | 426 | int err; |
| 428 | 427 | ||
| 429 | /* register handlers */ | 428 | /* register handlers */ |