diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-14 17:08:48 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-14 17:08:48 -0600 |
| commit | 726246d2e6d0ed53ac22b6fec50d1345f25e6730 (patch) | |
| tree | a02c267d02bfea91fa106e17b8ee22675881d848 /drivers/pci/pcie | |
| parent | 5899309c90971d5418abc4bf370bee871ff6072c (diff) | |
| parent | fc6504b3a4dc9beae782a11e6f7c3c4a9f077fb8 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI / ACPI / PM: Use correct power state strings in messages
PCI: Fix comment typo for pcie_pme_remove()
PCI: Add pcibios_release_device()
Diffstat (limited to 'drivers/pci/pcie')
| -rw-r--r-- | drivers/pci/pcie/pme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c index 795db1f9d50c..e56e594ce112 100644 --- a/drivers/pci/pcie/pme.c +++ b/drivers/pci/pcie/pme.c @@ -408,7 +408,7 @@ static int pcie_pme_resume(struct pcie_device *srv) /** * pcie_pme_remove - Prepare PCIe PME service device for removal. - * @srv - PCIe service device to resume. + * @srv - PCIe service device to remove. */ static void pcie_pme_remove(struct pcie_device *srv) { |