diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 09:08:02 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 09:08:02 -0600 |
| commit | 6dabee73d46bfafb8c588b21b14606914de97ee6 (patch) | |
| tree | 140f679ec718d022e9946d8534af5cd7646340c6 /drivers/pci/probe.c | |
| parent | 78890b5989d96ddce989cde929c45ceeded0fcaf (diff) | |
| parent | 769ae543dc8d5745e1ade88cbcf1271a96276fd2 (diff) | |
Merge branch 'pci/trivial' into next
* pci/trivial:
PCI: Drop duplicate const in DECLARE_PCI_FIXUP_SECTION
PCI: Drop bogus default from ARCH_SUPPORTS_MSI
PCI: cpqphp: Remove unreachable path
PCI: Remove bus number resource debug messages
PCI/AER: Print completion message at KERN_INFO to match starting message
PCI: Fix drivers/pci/pci.c kernel-doc warnings
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 3cdba8b3f81..23961117663 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1748,11 +1748,6 @@ int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) "busn_res: can not insert %pR under %s%pR (conflicts with %s %pR)\n", res, pci_is_root_bus(b) ? "domain " : "", parent_res, conflict->name, conflict); - else - dev_printk(KERN_DEBUG, &b->dev, - "busn_res: %pR is inserted under %s%pR\n", - res, pci_is_root_bus(b) ? "domain " : "", - parent_res); return conflict == NULL; } |