diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/net/e100.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (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 | } |