Commit e268cd69 authored by Linus Torvalds's avatar Linus Torvalds

Revert duplicate initialization from -ac merge

Cset exclude: alan@lxorguk.ukuu.org.uk|ChangeSet|20021126021252|43411
parent 152b33eb
...@@ -575,7 +575,6 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) ...@@ -575,7 +575,6 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
} else { } else {
INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc, server); INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc, server);
INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc, server); INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc, server);
init_timer(&server->timeout_tm);
server->timeout_tm.data = (unsigned long)server; server->timeout_tm.data = (unsigned long)server;
server->timeout_tm.function = ncpdgram_timeout_call; server->timeout_tm.function = ncpdgram_timeout_call;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment