diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:42 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:42 -0500 |
| commit | 1cac57a267c1692594413f27913adec85ba3b02a (patch) | |
| tree | a53ec47abecf4b33d9dbe7c744f21de5b4fc7382 /drivers/crypto/hisilicon/qm.c | |
| parent | 5e19196c142f040a7d99bcc1540e2052c68231e8 (diff) | |
| parent | 5ec0a6fcb60ea430f8ee7e0bec22db9b22f856d3 (diff) | |
| download | linux-1cac57a267c1692594413f27913adec85ba3b02a.tar.bz2 | |
Merge branch 'pci/enumeration'
- Rename pcibios_add_device() to pcibios_device_add() since it's called
from pci_device_add() (Oliver O'Halloran)
- Don't try to enable AtomicOps on VFs, since they can only be enabled on
the PF (Selvin Xavier)
* pci/enumeration:
PCI: Do not enable AtomicOps on VFs
PCI: Rename pcibios_add_device() to pcibios_device_add()
Diffstat (limited to 'drivers/crypto/hisilicon/qm.c')
0 files changed, 0 insertions, 0 deletions