diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 01:11:17 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 01:11:17 -0400 |
| commit | 49327ad2bbbaf1945d5ba431522201574219d150 (patch) | |
| tree | 47beb374d0cfb77d401220f20e8cece4ce4469db /drivers/input/serio/i8042.c | |
| parent | f9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff) | |
| parent | 6521d0bf984ab1cc25795d312e21c438aea8b5d5 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/serio/i8042.c')
| -rw-r--r-- | drivers/input/serio/i8042.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index f58513160480..18db5a8c7478 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -1063,7 +1063,7 @@ static long i8042_panic_blink(int state) | |||
| 1063 | #ifdef CONFIG_X86 | 1063 | #ifdef CONFIG_X86 |
| 1064 | static void i8042_dritek_enable(void) | 1064 | static void i8042_dritek_enable(void) |
| 1065 | { | 1065 | { |
| 1066 | char param = 0x90; | 1066 | unsigned char param = 0x90; |
| 1067 | int error; | 1067 | int error; |
| 1068 | 1068 | ||
| 1069 | error = i8042_command(¶m, 0x1059); | 1069 | error = i8042_command(¶m, 0x1059); |