aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/mlx4/main.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-02-02 16:07:01 -0500
committerBjorn Helgaas <bhelgaas@google.com>2015-02-02 16:07:01 -0500
commit66e5bde9e5f9a4007be107c2926f96ec9b2b0010 (patch)
tree1ab7f8f193cffdfc7d3df7f19213d8b354271eb6 /drivers/infiniband/hw/mlx4/main.c
parentae03e7c46524b9402936afd9e2a5b50547ffaf78 (diff)
parentf65d539c6fb4de92df4d3c8a49b9ac3fd8d17f18 (diff)
parent6a878e5085fe97bd1e222b7883a1b815fcbbe4ed (diff)
Merge branches 'pci/misc' and 'pci/msi' into next
* pci/misc: r8169: use PCI define for Max_Read_Request_Size [SCSI] esas2r: use PCI define for Max_Read_Request_Size tile: use PCI define for Max_Read_Request_Size rapidio/tsi721: use PCI define for Max_Read_Request_Size PCI: Add defines for PCIe Max_Read_Request_Size PCI/ASPM: Use standard parsing functions for sysfs setters * pci/msi: PCI: Fail MSI-X mappings if there's no space assigned to MSI-X BAR