diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-14 02:23:40 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-14 02:23:40 +0200 |
| commit | 1134ca268e7387773cd6cf57aa82cc9d5e0f9127 (patch) | |
| tree | d1dec9989de703de689c240dd2cd157fe72f49a9 /drivers/input/serio/i8042-sparcio.h | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: i8042 - skip selftest on ASUS laptops (diff) | |
| download | linux-1134ca268e7387773cd6cf57aa82cc9d5e0f9127.tar.xz linux-1134ca268e7387773cd6cf57aa82cc9d5e0f9127.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.9 merge window.
Diffstat (limited to 'drivers/input/serio/i8042-sparcio.h')
| -rw-r--r-- | drivers/input/serio/i8042-sparcio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index afcd1c1a05b2..6231d63860ee 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h @@ -130,7 +130,7 @@ static int __init i8042_platform_init(void) } } - i8042_reset = 1; + i8042_reset = I8042_RESET_ALWAYS; return 0; } |