Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84355
b: refs/heads/master
c: c18bab8
h: refs/heads/master
i:
  84353: 0d155d8
  84351: f2f23d9
v: v3
  • Loading branch information
Andrew Morton authored and Dmitry Torokhov committed Feb 6, 2008
1 parent 9753f79 commit 5238620
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cec69c376be132a6afdc55b8090a389eaa3cd770
refs/heads/master: c18bab80d16f04db3e263cc97522d21693cad2ce
4 changes: 2 additions & 2 deletions trunk/drivers/input/serio/i8042.c
Original file line number Diff line number Diff line change
Expand Up @@ -1172,14 +1172,14 @@ static int __devinit i8042_probe(struct platform_device *dev)
if (error)
goto out_fail;
}

#ifdef CONFIG_X86
if (i8042_dritek) {
param = 0x90;
error = i8042_command(&param, 0x1059);
if (error)
goto out_fail;
}

#endif
/*
* Ok, everything is ready, let's register all serio ports
*/
Expand Down

0 comments on commit 5238620

Please sign in to comment.