diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/input/mouse/lifebook.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/input/mouse/lifebook.c')
| -rw-r--r-- | drivers/input/mouse/lifebook.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c index 5e9d25067513..c57e8853b949 100644 --- a/drivers/input/mouse/lifebook.c +++ b/drivers/input/mouse/lifebook.c | |||
| @@ -62,7 +62,7 @@ static struct dmi_system_id lifebook_dmi_table[] = { | |||
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | 64 | ||
| 65 | static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_regs *regs) | 65 | static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) |
| 66 | { | 66 | { |
| 67 | unsigned char *packet = psmouse->packet; | 67 | unsigned char *packet = psmouse->packet; |
| 68 | struct input_dev *dev = psmouse->dev; | 68 | struct input_dev *dev = psmouse->dev; |
| @@ -70,8 +70,6 @@ static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_re | |||
| 70 | if (psmouse->pktcnt != 3) | 70 | if (psmouse->pktcnt != 3) |
| 71 | return PSMOUSE_GOOD_DATA; | 71 | return PSMOUSE_GOOD_DATA; |
| 72 | 72 | ||
| 73 | input_regs(dev, regs); | ||
| 74 | |||
| 75 | /* calculate X and Y */ | 73 | /* calculate X and Y */ |
| 76 | if ((packet[0] & 0x08) == 0x00) { | 74 | if ((packet[0] & 0x08) == 0x00) { |
| 77 | input_report_abs(dev, ABS_X, | 75 | input_report_abs(dev, ABS_X, |