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/declance.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/declance.c')
-rw-r--r-- | drivers/net/declance.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 6b1e77cc069e..3e3506411ac0 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -773,8 +773,6 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id) | |||
773 | return IRQ_HANDLED; | 773 | return IRQ_HANDLED; |
774 | } | 774 | } |
775 | 775 | ||
776 | struct net_device *last_dev = 0; | ||
777 | |||
778 | static int lance_open(struct net_device *dev) | 776 | static int lance_open(struct net_device *dev) |
779 | { | 777 | { |
780 | volatile u16 *ib = (volatile u16 *)dev->mem_start; | 778 | volatile u16 *ib = (volatile u16 *)dev->mem_start; |
@@ -782,8 +780,6 @@ static int lance_open(struct net_device *dev) | |||
782 | volatile struct lance_regs *ll = lp->ll; | 780 | volatile struct lance_regs *ll = lp->ll; |
783 | int status = 0; | 781 | int status = 0; |
784 | 782 | ||
785 | last_dev = dev; | ||
786 | |||
787 | /* Stop the Lance */ | 783 | /* Stop the Lance */ |
788 | writereg(&ll->rap, LE_CSR0); | 784 | writereg(&ll->rap, LE_CSR0); |
789 | writereg(&ll->rdp, LE_C0_STOP); | 785 | writereg(&ll->rdp, LE_C0_STOP); |