Merge branch 'dpc'

Conflicts:
	lib/header.h

diff --cc lib/header.h
index 0183d1fa8ebc73ea43f22c4d58a6e5c0e63997fc,b7cbc9dd50a699c657cb9c0a1f7e88b78e5fe699..1c5968b85e4a9c301059ffb9a938419c74d54e73
--- 1/lib/header.h
--- 2/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 ***/
  

diff --cc ls-ecaps.c
Simple merge