diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-05-10 12:39:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-05-10 12:39:28 -0400 |
| commit | 1e4b1057121bc756b91758a434b504d2010f6088 (patch) | |
| tree | b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e /drivers/net/3c507.c | |
| parent | 3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a (diff) | |
| parent | 3ee943728fff536edaf8f59faa58aaa1aa7366e3 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
net/bridge/br_device.c
net/bridge/br_forward.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/3c507.c')
| -rw-r--r-- | drivers/net/3c507.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index b32b7a1710b7..9e95afa49fbe 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
| @@ -449,7 +449,6 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) | |||
| 449 | pr_debug("%s", version); | 449 | pr_debug("%s", version); |
| 450 | 450 | ||
| 451 | lp = netdev_priv(dev); | 451 | lp = netdev_priv(dev); |
| 452 | memset(lp, 0, sizeof(*lp)); | ||
| 453 | spin_lock_init(&lp->lock); | 452 | spin_lock_init(&lp->lock); |
| 454 | lp->base = ioremap(dev->mem_start, RX_BUF_END); | 453 | lp->base = ioremap(dev->mem_start, RX_BUF_END); |
| 455 | if (!lp->base) { | 454 | if (!lp->base) { |