diff options
author | 2006-03-14 17:05:45 -0600 | |
---|---|---|
committer | 2006-03-14 17:05:45 -0600 | |
commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
tree | 6a52864aff79691689aea21cb0cb928327d5de5b /drivers/net/e100.c | |
parent | JFS: add uid, gid, and umask mount options (diff) | |
parent | [PATCH] JFS: Take logsync lock before testing mp->lsn (diff) | |
download | linux-dev-c5111f504d2a9b0d258d7c4752b4093523315989.tar.xz linux-dev-c5111f504d2a9b0d258d7c4752b4093523315989.zip |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r-- | drivers/net/e100.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index bf1fd2b98bf8..24253c807e55 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2752,8 +2752,6 @@ static int e100_resume(struct pci_dev *pdev) retval = pci_enable_wake(pdev, 0, 0); if (retval) DPRINTK(PROBE,ERR, "Error clearing wake events\n"); - if(e100_hw_init(nic)) - DPRINTK(HW, ERR, "e100_hw_init failed\n"); netif_device_attach(netdev); if(netif_running(netdev)) |