diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-12 19:14:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-12 19:14:22 -0400 |
commit | 030352a9c7715780b2c01033ae9afe56249bb7cc (patch) | |
tree | cc23683773d0d63712f4e6ea6824383f1d696e05 /drivers/net/sunlance.c | |
parent | e6e30add6bd8115af108de2a13ec82d997a55777 (diff) | |
parent | 0c1aa20fb87b796d904f4d89ad12e5a0c483127b (diff) |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sunlance.c')
-rw-r--r-- | drivers/net/sunlance.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 26ade68aeabf..4e994f87469e 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -915,15 +915,11 @@ static void build_fake_packet(struct lance_private *lp) | |||
915 | lp->tx_new = TX_NEXT(entry); | 915 | lp->tx_new = TX_NEXT(entry); |
916 | } | 916 | } |
917 | 917 | ||
918 | struct net_device *last_dev; | ||
919 | |||
920 | static int lance_open(struct net_device *dev) | 918 | static int lance_open(struct net_device *dev) |
921 | { | 919 | { |
922 | struct lance_private *lp = netdev_priv(dev); | 920 | struct lance_private *lp = netdev_priv(dev); |
923 | int status = 0; | 921 | int status = 0; |
924 | 922 | ||
925 | last_dev = dev; | ||
926 | |||
927 | STOP_LANCE(lp); | 923 | STOP_LANCE(lp); |
928 | 924 | ||
929 | if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED, | 925 | if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED, |