From 77e5a1530cb50dc66025b045cc0acfe4ceb5b58d Mon Sep 17 00:00:00 2001 From: Andy Gospodarek Date: Wed, 22 Jul 2009 09:34:00 +0000 Subject: [PATCH] --- yaml --- r: 155879 b: refs/heads/master c: ffafa60d496f80c250f2ae0340ae94434c0b0b4d h: refs/heads/master i: 155877: fca2cb3666720013f03b03a67fe2c6436229f05d 155875: 35a03985aef052178ffe1bc9ec981a44ddc4d161 155871: 3193a96ad7df4b383ab4bf5bcadb3cc8eb3ab810 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 06dc4ec013af..6f16d1078fef 100644 --- 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 index 47a3c6d70569..68877599f6db 100644 --- 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 */