diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:48:30 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:48:30 +0100 |
| commit | 0b3571274b8ff53c0e08bc667ecd3d8a43bd8714 (patch) | |
| tree | 57fa58c4c5abe63cccf3fd842548d16fc8d792ba /drivers/pci/probe.c | |
| parent | Linux 3.8-rc4 (diff) | |
| parent | ACPI: update ej_event interface to take acpi_device (diff) | |
| download | linux-0b3571274b8ff53c0e08bc667ecd3d8a43bd8714.tar.xz linux-0b3571274b8ff53c0e08bc667ecd3d8a43bd8714.zip | |
Merge branch 'acpi-scan' into acpi-lpss
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 6186f03d84f3..2dcd22d9c816 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); |