diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-26 17:55:52 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-26 17:55:52 -0400 |
| commit | a0f75f9d495b3905b4c658c1d813a127f558a350 (patch) | |
| tree | c91e6d70118ff2d15b129990cd82008acc286ce7 /include/linux/pci_ids.h | |
| parent | b5969138542fa2f5e4466c147abc0917ff78cefe (diff) | |
| parent | 15fd830dd310e6cf589478e5e1e7733caf68e777 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci
PCI: Add CircuitCo vendor ID and subsystem ID
PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 84c0bcc2a147..3bed2e89611b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2476,6 +2476,9 @@ | |||
| 2476 | 2476 | ||
| 2477 | #define PCI_VENDOR_ID_ASMEDIA 0x1b21 | 2477 | #define PCI_VENDOR_ID_ASMEDIA 0x1b21 |
| 2478 | 2478 | ||
| 2479 | #define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 | ||
| 2480 | #define PCI_SUBSYSTEM_ID_CIRCUITCO_MINNOWBOARD 0x0001 | ||
| 2481 | |||
| 2479 | #define PCI_VENDOR_ID_TEKRAM 0x1de1 | 2482 | #define PCI_VENDOR_ID_TEKRAM 0x1de1 |
| 2480 | #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 | 2483 | #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 |
| 2481 | 2484 | ||