diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/declance.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/declance.c')
| -rw-r--r-- | drivers/net/declance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index d7de376d7178..219eb5ad5c12 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
| @@ -1255,7 +1255,7 @@ static int __devinit dec_lance_probe(struct device *bdev, const int type) | |||
| 1255 | */ | 1255 | */ |
| 1256 | init_timer(&lp->multicast_timer); | 1256 | init_timer(&lp->multicast_timer); |
| 1257 | lp->multicast_timer.data = (unsigned long) dev; | 1257 | lp->multicast_timer.data = (unsigned long) dev; |
| 1258 | lp->multicast_timer.function = &lance_set_multicast_retry; | 1258 | lp->multicast_timer.function = lance_set_multicast_retry; |
| 1259 | 1259 | ||
| 1260 | ret = register_netdev(dev); | 1260 | ret = register_netdev(dev); |
| 1261 | if (ret) { | 1261 | if (ret) { |