diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-02 01:50:39 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-02 01:50:39 +0200 |
| commit | 0345d3f8b2dc761fdebc009093d01c6cec4f11f7 (patch) | |
| tree | 850d0e0b6d363953fd8c23ec43ce2826a53ce32b /drivers/pci/pci-acpi.c | |
| parent | Merge branch 'pci/kevin-bus-to-resource' into next (diff) | |
| parent | PCI: Replace strict_strtoul() with kstrtoul() (diff) | |
| download | linux-0345d3f8b2dc761fdebc009093d01c6cec4f11f7.tar.xz linux-0345d3f8b2dc761fdebc009093d01c6cec4f11f7.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Replace strict_strtoul() with kstrtoul()
PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPM
PCI: Replace printks with appropriate pr_*()
PCI: Fix kerneldoc for pci_disable_link_state()
x86/PCI: Increase info->res_num before checking pci_use_crs
PCI: Fix INTC comment typo for pci_swizzle_interrupt_pin()
PCI: Convert ioapic.c to module_pci_driver
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index e4b1fb2c0f5d..6c15d6a96935 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -376,12 +376,12 @@ static int __init acpi_pci_init(void) int ret; if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI) { - printk(KERN_INFO"ACPI FADT declares the system doesn't support MSI, so disable it\n"); + pr_info("ACPI FADT declares the system doesn't support MSI, so disable it\n"); pci_no_msi(); } if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM) { - printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n"); + pr_info("ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n"); pcie_no_aspm(); } |