diff --git a/[refs] b/[refs]
index 3887e768874e..55cb647eb9fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78566fecbb12a7616ae9a88b2ffbc8062c4a89e3
+refs/heads/master: e7272403d2f9be3dbb7cc185fcc390e781b1af6b
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
index 453115acaad2..5cf78d612c45 100644
--- a/trunk/drivers/net/e100.c
+++ b/trunk/drivers/net/e100.c
@@ -2738,9 +2738,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 		nic->flags |= wol_magic;
 
 	/* ack any pending wake events, disable PME */
-	err = pci_enable_wake(pdev, 0, 0);
-	if (err)
-		DPRINTK(PROBE, ERR, "Error clearing wake event\n");
+	pci_pme_active(pdev, false);
 
 	strcpy(netdev->name, "eth%d");
 	if((err = register_netdev(netdev))) {