diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 09:55:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 09:55:55 +0100 |
| commit | 230f9bb701d37ae9b48e96456689452978f5c439 (patch) | |
| tree | 9d2690917533bbb4498c8c9df838de2d38360912 /drivers/net/davinci_emac.c | |
| parent | net: Fix build warning in sock_bindtodevice(). (diff) | |
| parent | decnet: netdevice refcount leak (diff) | |
| download | linux-230f9bb701d37ae9b48e96456689452978f5c439.tar.xz linux-230f9bb701d37ae9b48e96456689452978f5c439.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/cdc_ether.c
All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 f1b09c0992b4..79ce8e857eab 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -2217,7 +2217,7 @@ void emac_poll_controller(struct net_device *ndev) struct emac_priv *priv = netdev_priv(ndev); emac_int_disable(priv); - emac_irq(ndev->irq, priv); + emac_irq(ndev->irq, ndev); emac_int_enable(priv); } #endif |