diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
| commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
| tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/net/a2065.c | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/a2065.c')
| -rw-r--r-- | drivers/net/a2065.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c index 6c5719ae8cca..9c0837435b68 100644 --- a/drivers/net/a2065.c +++ b/drivers/net/a2065.c | |||
| @@ -475,16 +475,12 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id) | |||
| 475 | return IRQ_HANDLED; | 475 | return IRQ_HANDLED; |
| 476 | } | 476 | } |
| 477 | 477 | ||
| 478 | struct net_device *last_dev; | ||
| 479 | |||
| 480 | static int lance_open (struct net_device *dev) | 478 | static int lance_open (struct net_device *dev) |
| 481 | { | 479 | { |
| 482 | struct lance_private *lp = netdev_priv(dev); | 480 | struct lance_private *lp = netdev_priv(dev); |
| 483 | volatile struct lance_regs *ll = lp->ll; | 481 | volatile struct lance_regs *ll = lp->ll; |
| 484 | int ret; | 482 | int ret; |
| 485 | 483 | ||
| 486 | last_dev = dev; | ||
| 487 | |||
| 488 | /* Stop the Lance */ | 484 | /* Stop the Lance */ |
| 489 | ll->rap = LE_CSR0; | 485 | ll->rap = LE_CSR0; |
| 490 | ll->rdp = LE_C0_STOP; | 486 | ll->rdp = LE_C0_STOP; |
