aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-10-18 00:20:19 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-10-18 00:20:19 -0400
commit3136baf8d09458bb04332b81494fd13ad90fe94a (patch)
tree6593ef5894597bf6224cf0374e4d49b1499d347d /drivers/input/serio/i8042.c
parent1d02ad436235080b8a95a2c86a66cb7b8f2e9df9 (diff)
parentca047fedd89bbb4b79b61e0656a7b799e4e45e6d (diff)
Merge branch 'for-linus' into next
Diffstat (limited to 'drivers/input/serio/i8042.c')
-rw-r--r--drivers/input/serio/i8042.c2
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)
1485 1485
1486static void __exit i8042_exit(void) 1486static void __exit i8042_exit(void)
1487{ 1487{
1488 platform_driver_unregister(&i8042_driver);
1489 platform_device_unregister(i8042_platform_device); 1488 platform_device_unregister(i8042_platform_device);
1489 platform_driver_unregister(&i8042_driver);
1490 i8042_platform_exit(); 1490 i8042_platform_exit();
1491 1491
1492 panic_blink = NULL; 1492 panic_blink = NULL;