diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/e100.c | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 26073c345213..27d5d2f02533 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1949,7 +1949,7 @@ static int e100_rx_alloc_list(struct nic *nic) | |||
1949 | return 0; | 1949 | return 0; |
1950 | } | 1950 | } |
1951 | 1951 | ||
1952 | static irqreturn_t e100_intr(int irq, void *dev_id, struct pt_regs *regs) | 1952 | static irqreturn_t e100_intr(int irq, void *dev_id) |
1953 | { | 1953 | { |
1954 | struct net_device *netdev = dev_id; | 1954 | struct net_device *netdev = dev_id; |
1955 | struct nic *nic = netdev_priv(netdev); | 1955 | struct nic *nic = netdev_priv(netdev); |
@@ -2005,7 +2005,7 @@ static void e100_netpoll(struct net_device *netdev) | |||
2005 | struct nic *nic = netdev_priv(netdev); | 2005 | struct nic *nic = netdev_priv(netdev); |
2006 | 2006 | ||
2007 | e100_disable_irq(nic); | 2007 | e100_disable_irq(nic); |
2008 | e100_intr(nic->pdev->irq, netdev, NULL); | 2008 | e100_intr(nic->pdev->irq, netdev); |
2009 | e100_tx_clean(nic); | 2009 | e100_tx_clean(nic); |
2010 | e100_enable_irq(nic); | 2010 | e100_enable_irq(nic); |
2011 | } | 2011 | } |