diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/wan/dscc4.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/wan/dscc4.c')
| -rw-r--r-- | drivers/net/wan/dscc4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 07d00b4cf48a..3f759daf3ca4 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
| @@ -1128,7 +1128,7 @@ done: | |||
| 1128 | init_timer(&dpriv->timer); | 1128 | init_timer(&dpriv->timer); |
| 1129 | dpriv->timer.expires = jiffies + 10*HZ; | 1129 | dpriv->timer.expires = jiffies + 10*HZ; |
| 1130 | dpriv->timer.data = (unsigned long)dev; | 1130 | dpriv->timer.data = (unsigned long)dev; |
| 1131 | dpriv->timer.function = &dscc4_timer; | 1131 | dpriv->timer.function = dscc4_timer; |
| 1132 | add_timer(&dpriv->timer); | 1132 | add_timer(&dpriv->timer); |
| 1133 | netif_carrier_on(dev); | 1133 | netif_carrier_on(dev); |
| 1134 | 1134 | ||