fix conflict

Pcie40Applications/regconfig.cpp

@@ -271,6 +271,29 @@ pcie40_op(int dev, int ch, int op_addr, int addr, int data, pcie40reg_t pcie40)
   }
 
   if (op_addr == PCIE40_CHECKFEE) {
+    int hwtype;
+    int serial;
+    int fwtype;
+    int fwver;
+    static const char *feetype[] = {
+      "UNDEF", "SVD", "CDC", "BPID", "EPID", "ECL", "EECL", "KLM", "EKLM",
+      "TRG", "UNKNOWN-10", "UNKNOWN-11",
+      "UNKNOWN-12", "UNKNOWN-13", "DEMO", "TEST" };
+    static const char *demotype[] = {
+      "UNDEF", "HSLB-B2L", "SP605-B2L", "ML605-B2L", "AC701-B2L" };
+    static const char *trgtype[] = {
+      "TRGMERGER", /* = 0 */
+      "TRGTSF",    /* = 1 */
+      "TRG2D",     /* = 2 */
+      "TRG3D",     /* = 3 */
+      "TRGNN",     /* = 4 */
+      "TRGEVTT",   /* = 5 */
+      "TRGGRL",    /* = 6 */
+      "TRGGDL",    /* = 7 */
+      "TRGETM",    /* = 8 */
+      "TRGTOP",    /* = 9 */
+      "TRGKLM",    /* = 10 */
+    };
     if (!pcie40_b2l_status(dev_slot, ch)) {
       printf("Failed: b2l is down\n");
       return -1;