---

yaml --- r: 197895 b: refs/heads/master c: 52b265a h: refs/heads/master i: 197893: e02bea1 197891: cae5b68 197887: 0c558c4 v: v3
git-mirror · May 11, 2010 · ac1228a · ac1228a
1 parent c3a6497
commit ac1228a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75568f8094eb0333e9c2109b23cbc8b82d318a3c
+refs/heads/master: 52b265a12768b9a72679bec825eb82c784116464
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
@@ -1631,7 +1631,6 @@ void pci_pm_init(struct pci_dev *dev)
 		 * let the user space enable it to wake up the system as needed.
 		 */
 		device_set_wakeup_capable(&dev->dev, true);
-		device_set_wakeup_enable(&dev->dev, false);
 		/* Disable the PME# generation functionality */
 		pci_pme_active(dev, false);
 	} else {
@@ -1655,7 +1654,6 @@ void platform_pci_wakeup_init(struct pci_dev *dev)
 		return;
 
 	device_set_wakeup_capable(&dev->dev, true);
-	device_set_wakeup_enable(&dev->dev, false);
 	platform_pci_sleep_wake(dev, false);
 }