summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-10-17 21:55:08 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-10-17 21:55:08 -0700
commit487680ca16759a671984fcd00a514fde9d9f3b9a (patch)
treefd4b8758c31a9606cf747efd958465eac0a8ebbc /drivers/input
parentd103bdbf34d5ab76a92fc0d1a4aae7b1af5c8493 (diff)
parent879a1092976b201f23c69c7159fe51be1c8c7bc2 (diff)
Merge bk://ldm.bkbits.net/linux-2.5-core
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/sa1111ps2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 502d3c90b864..01dc3c0681f2 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -354,7 +354,7 @@ static int __init ps2_init(void)
static void __exit ps2_exit(void)
{
- remove_driver(&ps2_driver.drv);
+ driver_unregister(&ps2_driver.drv);
}
module_init(ps2_init);