diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-17 21:20:19 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-17 21:20:19 -0700 |
| commit | 3136baf8d09458bb04332b81494fd13ad90fe94a (patch) | |
| tree | 6593ef5894597bf6224cf0374e4d49b1499d347d /drivers/input/serio/i8042.c | |
| parent | Input: ad7877 - filter events where pressure is beyond the maximum (diff) | |
| parent | Input: wacom - fix pressure in Cintiq 21UX2 (diff) | |
| download | linux-dev-3136baf8d09458bb04332b81494fd13ad90fe94a.tar.xz linux-dev-3136baf8d09458bb04332b81494fd13ad90fe94a.zip | |
Merge branch 'for-linus' into next
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 7d67ad1b80ba..18db5a8c7478 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1485,8 +1485,8 @@ static int __init i8042_init(void) static void __exit i8042_exit(void) { - platform_driver_unregister(&i8042_driver); platform_device_unregister(i8042_platform_device); + platform_driver_unregister(&i8042_driver); i8042_platform_exit(); panic_blink = NULL; |