diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-25 16:53:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-25 16:53:27 -0800 |
| commit | e268cd692becbdf5b282803fd787f3bd236f0ae9 (patch) | |
| tree | 030e338de8bc9a992f26d22b66e7838cdb51eab0 | |
| parent | 152b33ebaeb1181e24d194b760f529527703a041 (diff) | |
Revert duplicate initialization from -ac merge
Cset exclude: alan@lxorguk.ukuu.org.uk|ChangeSet|20021126021252|43411
| -rw-r--r-- | fs/ncpfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 5b08b3ca0074..ca32f9246891 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c @@ -575,7 +575,6 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) } else { INIT_WORK(&server->rcv.tq, ncpdgram_rcv_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.function = ncpdgram_timeout_call; } |