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
This commit is contained in:
@@ -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"
|
||||
|
@@ -68,3 +68,4 @@ ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
|
||||
|
||||
# PCI host controller drivers
|
||||
obj-y += host/
|
||||
obj-y += switch/
|
||||
|
13
drivers/pci/switch/Kconfig
Normal file
13
drivers/pci/switch/Kconfig
Normal file
@@ -0,0 +1,13 @@
|
||||
menu "PCI switch controller drivers"
|
||||
depends on PCI
|
||||
|
||||
config PCI_SW_SWITCHTEC
|
||||
tristate "MicroSemi Switchtec PCIe Switch Management Driver"
|
||||
help
|
||||
Enables support for the management interface for the MicroSemi
|
||||
Switchtec series of PCIe switches. Supports userspace access
|
||||
to submit MRPC commands to the switch via /dev/switchtecX
|
||||
devices. See <file:Documentation/switchtec.txt> for more
|
||||
information.
|
||||
|
||||
endmenu
|
1
drivers/pci/switch/Makefile
Normal file
1
drivers/pci/switch/Makefile
Normal file
@@ -0,0 +1 @@
|
||||
obj-$(CONFIG_PCI_SW_SWITCHTEC) += switchtec.o
|
1600
drivers/pci/switch/switchtec.c
Normal file
1600
drivers/pci/switch/switchtec.c
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user