diff options
| author | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
| commit | f40d6817a5c2bf84f5fe7b5d1a83f1e8f8669951 (patch) | |
| tree | 1c515a34a60f65cbfd3cf1a387427d0a9fdf878f /drivers/net/davinci_emac.c | |
| parent | 103a196f4224dc6872081305cf7f82ebf67aa7bd (diff) | |
| parent | 46557bef3f3834ac33031c7be27d39d90d507442 (diff) | |
Merge remote branch 'airlied/drm-next' into drm-intel-next
Diffstat (limited to 'drivers/net/davinci_emac.c')
| -rw-r--r-- | drivers/net/davinci_emac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index f72c56dec33c..3179521aee90 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
| @@ -2221,7 +2221,7 @@ void emac_poll_controller(struct net_device *ndev) | |||
| 2221 | struct emac_priv *priv = netdev_priv(ndev); | 2221 | struct emac_priv *priv = netdev_priv(ndev); |
| 2222 | 2222 | ||
| 2223 | emac_int_disable(priv); | 2223 | emac_int_disable(priv); |
| 2224 | emac_irq(ndev->irq, priv); | 2224 | emac_irq(ndev->irq, ndev); |
| 2225 | emac_int_enable(priv); | 2225 | emac_int_enable(priv); |
| 2226 | } | 2226 | } |
| 2227 | #endif | 2227 | #endif |