projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
[linux-2.6-microblaze.git]
/
drivers
/
block
/
swim3.c
diff --git
a/drivers/block/swim3.c
b/drivers/block/swim3.c
index
e620e42
..
af51015
100644
(file)
--- a/
drivers/block/swim3.c
+++ b/
drivers/block/swim3.c
@@
-397,7
+397,7
@@
static void set_timeout(struct floppy_state *fs, int nticks,
if (fs->timeout_pending)
del_timer(&fs->timeout);
fs->timeout.expires = jiffies + nticks;
- fs->timeout.function =
(TIMER_FUNC_TYPE)
proc;
+ fs->timeout.function = proc;
add_timer(&fs->timeout);
fs->timeout_pending = 1;
}