summaryrefslogtreecommitdiffstats
path: root/drivers/pci/slot.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-04-04 13:27:45 -0500
committerBjorn Helgaas <helgaas@kernel.org>2018-04-04 13:27:45 -0500
commit43b90eaed57679731ae340a47cef49e59a321c2e (patch)
tree8fe583ff17647d4b079c977a2b899b738669adcf /drivers/pci/slot.c
parent3da1b6174ba3f573ee795cc25c4b8633749bd036 (diff)
parentad32eb2df801548a4b55802384fbbfbc04d76bfa (diff)
downloadlinux-43b90eaed57679731ae340a47cef49e59a321c2e.tar.bz2
Merge branch 'pci/misc'
- use PCI_EXP_DEVCTL2_COMP_TIMEOUT in rapidio/tsi721 (Bjorn Helgaas) - remove possible NULL pointer dereference in of_pci_bus_find_domain_nr() (Shawn Lin) - report quirk timings with dev_info (Bjorn Helgaas) - report quirks that take longer than 10ms (Bjorn Helgaas) - add and use Altera Vendor ID (Johannes Thumshirn) - tidy Makefiles and comments (Bjorn Helgaas) * pci/misc: PCI: Always define the of_node helpers PCI: Tidy comments PCI: Tidy Makefiles mcb: Add Altera PCI ID to mcb-pci PCI: Add Altera vendor ID PCI: Report quirks that take more than 10ms PCI: Report quirk timings with pci_info() instead of pr_debug() PCI: Fix NULL pointer dereference in of_pci_bus_find_domain_nr() rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro
Diffstat (limited to 'drivers/pci/slot.c')
-rw-r--r--drivers/pci/slot.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index 191893e19d5c..e634229ece89 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * drivers/pci/slot.c
* Copyright (C) 2006 Matthew Wilcox <matthew@wil.cx>
* Copyright (C) 2006-2009 Hewlett-Packard Development Company, L.P.
* Alex Chiang <achiang@hp.com>