diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-25 03:31:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-25 03:31:07 -0400 |
| commit | cc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch) | |
| tree | bdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/typhoon.c | |
| parent | 461e6c856faf9cdd8862fa4d0785974a64e39dba (diff) | |
| parent | f946dffed6334f08da065a89ed65026ebf8b33b4 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 333961bb7873..c0dd25ba7a18 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
| @@ -2183,7 +2183,6 @@ typhoon_resume(struct pci_dev *pdev) | |||
| 2183 | } | 2183 | } |
| 2184 | 2184 | ||
| 2185 | netif_device_attach(dev); | 2185 | netif_device_attach(dev); |
| 2186 | netif_start_queue(dev); | ||
| 2187 | return 0; | 2186 | return 0; |
| 2188 | 2187 | ||
| 2189 | reset: | 2188 | reset: |