diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-24 13:17:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 13:17:06 -0800 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /drivers/staging/et131x/et131x_initpci.c | |
| parent | net: arp_ioctl() must hold RTNL (diff) | |
| parent | fix a shutdown regression in intel_idle (diff) | |
| download | linux-dev-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.tar.xz linux-dev-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/staging/et131x/et131x_initpci.c')
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 10bcb45d73a3..f62ba7a68f34 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -783,7 +783,7 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev) /* Retrieve the net_device pointer from the pci_dev struct, as well * as the private adapter struct */ - netdev = (struct net_device *) pci_get_drvdata(pdev); + netdev = pci_get_drvdata(pdev); adapter = netdev_priv(netdev); /* Perform device cleanup */ |