Merge branch 'master'

[linux-2.6-omap-h63xx.git] / drivers / net / wan / x25_asy.c

diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 1c540d825551f6c0194d30e19a5cb51ffcaec5b4..bdf672c48182a148dd5420f4aee505f340d2114e 100644 (file)
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -829,7 +829,7 @@ static void __exit exit_x25_asy(void)
        }
 
        kfree(x25_asy_devs);
-       tty_register_ldisc(N_X25, NULL);
+       tty_unregister_ldisc(N_X25);
 }
 
 module_init(init_x25_asy);