From: Martin Mares <mj@ucw.cz>
Date: Sat, 14 May 2016 10:02:04 +0000 (+0200)
Subject: Merge branch 'dpc'
X-Git-Tag: v3.5.0~3
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=c51f8fa45885a739a728d0139ea59c3e17ffcc4e;p=pciutils.git

Merge branch 'dpc'

Conflicts:
	lib/header.h
---

c51f8fa45885a739a728d0139ea59c3e17ffcc4e
diff --cc lib/header.h
index 0183d1f,b7cbc9d..1c5968b
--- a/lib/header.h
+++ b/lib/header.h
@@@ -229,8 -229,8 +229,9 @@@
  #define PCI_EXT_CAP_ID_TPH	0x17	/* Transaction processing hints */
  #define PCI_EXT_CAP_ID_LTR	0x18	/* Latency Tolerance Reporting */
  #define PCI_EXT_CAP_ID_PASID	0x1b	/* Process Address Space ID */
 -#define PCI_EXT_CAP_ID_L1PM	0x1e	/* L1 PM Substates */
+ #define PCI_EXT_CAP_ID_DPC	0x1d	/* Downstream Port Containment */
 +#define PCI_EXT_CAP_ID_L1PM	0x1e	/* L1 PM Substates */
 +#define PCI_EXT_CAP_ID_PTM	0x1f	/* Precision Time Measurement */
  
  /*** Definitions of capabilities ***/