diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 23:59:20 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 23:59:20 +0300 |
| commit | d450f828b50c9f94b40625ca100991252d2107be (patch) | |
| tree | a9c67f7ab401a9f4e2448a8a0487030add02077e /include/linux | |
| parent | 617e3a8bc7c2270dd192cc1e5ca14c6664206149 (diff) | |
| parent | 9a1471222189bdab467db0a0043c66b95142d5a5 (diff) | |
| download | linux-d450f828b50c9f94b40625ca100991252d2107be.tar.xz | |
Merge branch 'pci/misc'
- Align checking of syscall user config accessor return codes (Heiner
Kallweit)
- Fix "ordering" comment typos (Bjorn Helgaas)
- Fix 'ARM/TEXAS INSTRUMENT KEYSTONE CLOCKSOURCE' capitalization in
MAINTAINERS (Bjorn Helgaas)
- Add Silicom Denmark vendor ID (Martin Hundebøll)
- Apply CONFIG_PCI_DEBUG to entire drivers/pci hierarchy (Junhao He)
- Remove WARN_ON(in_interrupt()) (Sebastian Andrzej Siewior)
* pci/misc:
PCI: Remove WARN_ON(in_interrupt())
PCI: Apply CONFIG_PCI_DEBUG to entire drivers/pci hierarchy
PCI: Add Silicom Denmark vendor ID
MAINTAINERS: Fix 'ARM/TEXAS INSTRUMENT KEYSTONE CLOCKSOURCE' capitalization
Fix "ordering" comment typos
PCI: Align checking of syscall user config accessors
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d8156a5dbee8..aae07d512ca6 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2588,6 +2588,8 @@ #define PCI_VENDOR_ID_REDHAT 0x1b36 +#define PCI_VENDOR_ID_SILICOM_DENMARK 0x1c2c + #define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36 #define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 |