Merge /spare/repo/netdev-2.6/ branch 'ieee80211'

This commit is contained in:
Jeff Garzik
2005-06-26 23:42:30 -04:00
committed by Jeff Garzik
3115 changed files with 172049 additions and 68648 deletions

View File

@@ -2828,7 +2828,7 @@ static void __exit strip_exit_driver(void)
/* Unregister with the /proc/net file here. */
proc_net_remove("strip");
if ((i = tty_register_ldisc(N_STRIP, NULL)))
if ((i = tty_unregister_ldisc(N_STRIP)))
printk(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i);
printk(signoff);