diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 20:08:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 20:08:27 +1000 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /drivers/net/e100.c | |
| parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
| download | kernel_samsung_crespo-717cb906bd43a9ac00631d600adda5c6546843a6.zip kernel_samsung_crespo-717cb906bd43a9ac00631d600adda5c6546843a6.tar.gz kernel_samsung_crespo-717cb906bd43a9ac00631d600adda5c6546843a6.tar.bz2 | |
Merge ../linux-2.6/
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 1e56c8e..d0fa244 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2447,9 +2447,8 @@ static int e100_resume(struct pci_dev *pdev) #endif -static void e100_shutdown(struct device *dev) +static void e100_shutdown(struct pci_dev *pdev) { - struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); struct net_device *netdev = pci_get_drvdata(pdev); struct nic *nic = netdev_priv(netdev); @@ -2470,11 +2469,7 @@ static struct pci_driver e100_driver = { .suspend = e100_suspend, .resume = e100_resume, #endif - - .driver = { - .shutdown = e100_shutdown, - } - + .shutdown = e100_shutdown, }; static int __init e100_init_module(void) |