diff --git a/[refs] b/[refs] index 4c47a4917a42..5da8b19ec632 100644 --- 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 index 37499127c801..60fcb6f02c91 100644 --- 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); }