summaryrefslogtreecommitdiffstats
path: root/drivers/pci/Kconfig
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-04-28 10:33:41 -0500
committerBjorn Helgaas <bhelgaas@google.com>2017-04-28 10:33:41 -0500
commitd060c6fcef972e6a8d0898c55f1b7b6da89a6744 (patch)
tree77b414696b5016a9ff36b31f1e626b42bcf5f778 /drivers/pci/Kconfig
parent1154768ad342cc3ad295340130c1fad6869effa9 (diff)
parent52eabba5bcdb2853dec6ef007ba427b092034738 (diff)
downloadlinux-stable-d060c6fcef972e6a8d0898c55f1b7b6da89a6744.tar.gz
linux-stable-d060c6fcef972e6a8d0898c55f1b7b6da89a6744.tar.bz2
linux-stable-d060c6fcef972e6a8d0898c55f1b7b6da89a6744.zip
Merge branch 'pci/switchtec' into next
* pci/switchtec: switchtec: Add IOCTLs to the Switchtec driver switchtec: Add sysfs attributes to the Switchtec driver switchtec: Add user interface documentation MicroSemi Switchtec management interface driver Conflicts: drivers/pci/Kconfig
Diffstat (limited to 'drivers/pci/Kconfig')
-rw-r--r--drivers/pci/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 9747c1ec8c74..e0cacb7b8563 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -135,3 +135,4 @@ source "drivers/pci/hotplug/Kconfig"
source "drivers/pci/dwc/Kconfig"
source "drivers/pci/host/Kconfig"
source "drivers/pci/endpoint/Kconfig"
+source "drivers/pci/switch/Kconfig"