Merge branch 'cleanup' into bugfix-48-L1L2signaling

Conflicts: openair2/LAYER2/MAC/eNB_scheduler_ulsch.c targets/ARCH/COMMON/common_lib.c
2016-03-27 03:09:22 -07:00
parent 81f5d25e65 aab91dd0d4
commit 1d3ce6d99c
45 changed files with 167 additions and 1230 deletions
@@ -37,8 +37,6 @@
 #include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "SCHED/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include <math.h>

 #ifdef OPENAIR2