diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-26 00:36:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-26 00:36:44 +0100 |
| commit | cc38e519132f62d52db0a04d2eaed0d7c52fb165 (patch) | |
| tree | 35baaba355d6fbc1d43e9ca12278156f3eeab910 /drivers/pci/probe.c | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | b8bd759acd05281abf88cddef30c57313c109697 (diff) | |
Merge branch 'acpi-scan' into acpi-cleanup
The following commits depend on the 'acpi-scan' material.
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6186f03d84f..2dcd22d9c81 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1280,7 +1280,6 @@ static void pci_init_capabilities(struct pci_dev *dev) /* Power Management */ pci_pm_init(dev); - platform_pci_wakeup_init(dev); /* Vital Product Data */ pci_vpd_pci22_init(dev); |