Merge remote-tracking branch 'origin/improve_build_nr_lte_merge' into develop_integration_2020_w04

2020-01-24 12:00:49 +01:00
parent 7d26df6ecf 6cdac7e12f
commit 5c80ef080c
10 changed files with 147 additions and 173 deletions
@@ -104,14 +104,10 @@ static int DEFBFW[] = {0x00007fff};
  #include "UTIL/OTG/otg_extern.h"
 #endif

-#if defined(ENABLE_ITTI)
-  #if defined(ENABLE_USE_MME)
-    #include "s1ap_eNB.h"
-    #ifdef PDCP_USE_NETLINK
-      #include "SIMULATION/ETH_TRANSPORT/proto.h"
-    #endif
-  #endif
-#endif
+#include "s1ap_eNB.h"
+#include "SIMULATION/ETH_TRANSPORT/proto.h"
+
+

 #include "T.h"
 #include "nfapi_interface.h"