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/arm/ks8695net.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/arm/ks8695net.c')
| -rw-r--r-- | drivers/net/arm/ks8695net.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index 7413a87e40ff..6404704f7eac 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
| @@ -1472,7 +1472,6 @@ ks8695_probe(struct platform_device *pdev) | |||
| 1472 | 1472 | ||
| 1473 | /* Configure our private structure a little */ | 1473 | /* Configure our private structure a little */ |
| 1474 | ksp = netdev_priv(ndev); | 1474 | ksp = netdev_priv(ndev); |
| 1475 | memset(ksp, 0, sizeof(struct ks8695_priv)); | ||
| 1476 | 1475 | ||
| 1477 | ksp->dev = &pdev->dev; | 1476 | ksp->dev = &pdev->dev; |
| 1478 | ksp->ndev = ndev; | 1477 | ksp->ndev = ndev; |