diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 19:03:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 19:03:51 -0700 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/net/jazzsonic.c | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
| download | blackbird-op-linux-74d154189d597b91da4322996dbf4f5c3d1544ab.tar.gz blackbird-op-linux-74d154189d597b91da4322996dbf4f5c3d1544ab.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'drivers/net/jazzsonic.c')
| -rw-r--r-- | drivers/net/jazzsonic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 8baf5950731c..ec337b502fd9 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c @@ -229,6 +229,7 @@ static int __devinit jazz_sonic_probe(struct platform_device *pdev) lp = netdev_priv(dev); lp->device = &pdev->dev; SET_NETDEV_DEV(dev, &pdev->dev); + platform_set_drvdata(pdev, dev); netdev_boot_setup_check(dev); |
