aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-21 22:00:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-21 22:00:43 -0500
commit5ea8051a23de7b39bd5efebcaf63c05fd03f0d98 (patch)
tree1c74a3b42bf7eb067dad75da5c42d6bf535f42b0
parent66b5920f61b020fc2fc34fef9c4fcdd86df3b52e (diff)
parentc889b89619339636240227abb9ee5c9ec1167a1a (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
-rw-r--r--drivers/serial/imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 355cd93a8a87..83c4c1216587 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -994,7 +994,7 @@ static int __init imx_serial_init(void)
994static void __exit imx_serial_exit(void) 994static void __exit imx_serial_exit(void)
995{ 995{
996 uart_unregister_driver(&imx_reg); 996 uart_unregister_driver(&imx_reg);
997 driver_unregister(&serial_imx_driver); 997 platform_driver_unregister(&serial_imx_driver);
998} 998}
999 999
1000module_init(imx_serial_init); 1000module_init(imx_serial_init);