---

yaml --- r: 155879 b: refs/heads/master c: ffafa60 h: refs/heads/master i: 155877: fca2cb3 155875: 35a0398 155871: 3193a96 v: v3
git-mirror · Jul 23, 2009 · 77e5a15 · 77e5a15
1 parent 096a4fe
commit 77e5a15
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 601278659d5717b4f7a14fbc9f2b9d559bba6aef
+refs/heads/master: ffafa60d496f80c250f2ae0340ae94434c0b0b4d
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -5640,7 +5640,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 		adapter->wol = 0;
 		break;
 	}
-	device_init_wakeup(&adapter->pdev->dev, true);
 	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
 
 	/* pick up the PCI bus settings for reporting later */