diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-23 18:00:08 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-23 18:00:08 -0600 |
| commit | 63495fff27dfa0ce89ceb8f6350976e822398c5c (patch) | |
| tree | b453592a137b66666df3016330bd2afac5ab7fbe /include | |
| parent | 3ba8b7c542cd06eafbd24f266a00623b89577d9d (diff) | |
| parent | f0308261b1dd5acba5c7e797159e60f94706df7d (diff) | |
| download | linux-stable-63495fff27dfa0ce89ceb8f6350976e822398c5c.tar.gz linux-stable-63495fff27dfa0ce89ceb8f6350976e822398c5c.tar.bz2 linux-stable-63495fff27dfa0ce89ceb8f6350976e822398c5c.zip | |
Merge branch 'pci/yijing-pci_is_pcie-v2' into next
* pci/yijing-pci_is_pcie-v2:
powerpc/pci: Use pci_is_pcie() to simplify code
[SCSI] qla2xxx: Use pcie_is_pcie() to simplify code
[SCSI] csiostor: Use pcie_capability_clear_and_set_word() to simplify code
[SCSI] bfa: Use pcie_set()/get_readrq() to simplify code
x86/pci: Use cached pci_dev->pcie_cap to simplify code
PCI: Use pci_is_pcie() to simplify code
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/pci_regs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index baa7852468ef..1a38377a0032 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -558,7 +558,8 @@ #define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000 /* New message signaling */ #define PCI_EXP_DEVCAP2_OBFF_WAKE 0x00080000 /* Re-use WAKE# for OBFF */ #define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ -#define PCI_EXP_DEVCTL2_ARI 0x20 /* Alternative Routing-ID */ +#define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f /* Completion Timeout Value */ +#define PCI_EXP_DEVCTL2_ARI 0x0020 /* Alternative Routing-ID */ #define PCI_EXP_DEVCTL2_IDO_REQ_EN 0x0100 /* Allow IDO for requests */ #define PCI_EXP_DEVCTL2_IDO_CMP_EN 0x0200 /* Allow IDO for completions */ #define PCI_EXP_DEVCTL2_LTR_EN 0x0400 /* Enable LTR mechanism */ |