diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-13 17:23:40 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-13 17:23:40 -0700 |
| commit | 1134ca268e7387773cd6cf57aa82cc9d5e0f9127 (patch) | |
| tree | d1dec9989de703de689c240dd2cd157fe72f49a9 /drivers/input/serio/i8042-unicore32io.h | |
| parent | c758f96a8c346ac5a6822b521ec92308c5774381 (diff) | |
| parent | 930e19248e9b61da36c967687ca79c4d5f977919 (diff) | |
| download | op-kernel-dev-1134ca268e7387773cd6cf57aa82cc9d5e0f9127.zip op-kernel-dev-1134ca268e7387773cd6cf57aa82cc9d5e0f9127.tar.gz | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.9 merge window.
Diffstat (limited to 'drivers/input/serio/i8042-unicore32io.h')
| -rw-r--r-- | drivers/input/serio/i8042-unicore32io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h index 73f5cc1..4557475 100644 --- a/drivers/input/serio/i8042-unicore32io.h +++ b/drivers/input/serio/i8042-unicore32io.h @@ -61,7 +61,7 @@ static inline int i8042_platform_init(void) if (!request_mem_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042")) return -EBUSY; - i8042_reset = 1; + i8042_reset = I8042_RESET_ALWAYS; return 0; } |
