The original and a "new" file were maintained during the
early portions of the patch series in order to ensure that
all individual patches compiled cleanly. It is now safe to
rename the new file, and use it unconditionally in all DLB
source files.
Signed-off-by: Timothy McDaniel <timothy.mcdan...@intel.com>
---
.../event/dlb2/pf/base/{dlb2_hw_types_new.h => dlb2_hw_types.h} | 0
drivers/event/dlb2/pf/base/dlb2_resource.c | 2 +-
drivers/event/dlb2/pf/dlb2_main.c | 2 +-
drivers/event/dlb2/pf/dlb2_main.h | 2 +-
drivers/event/dlb2/pf/dlb2_pf.c | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename drivers/event/dlb2/pf/base/{dlb2_hw_types_new.h => dlb2_hw_types.h}
(100%)
diff --git a/drivers/event/dlb2/pf/base/dlb2_hw_types_new.h
b/drivers/event/dlb2/pf/base/dlb2_hw_types.h
similarity index 100%
rename from drivers/event/dlb2/pf/base/dlb2_hw_types_new.h
rename to drivers/event/dlb2/pf/base/dlb2_hw_types.h
diff --git a/drivers/event/dlb2/pf/base/dlb2_resource.c
b/drivers/event/dlb2/pf/base/dlb2_resource.c
index 4b3d1202c..e5fa0f047 100644
--- a/drivers/event/dlb2/pf/base/dlb2_resource.c
+++ b/drivers/event/dlb2/pf/base/dlb2_resource.c
@@ -4,7 +4,7 @@
#include "dlb2_user.h"
-#include "dlb2_hw_types_new.h"
+#include "dlb2_hw_types.h"
#include "dlb2_mbox.h"
#include "dlb2_osdep.h"
#include "dlb2_osdep_bitmap.h"
diff --git a/drivers/event/dlb2/pf/dlb2_main.c
b/drivers/event/dlb2/pf/dlb2_main.c
index 3ab0c3ef5..1f6ccf8e4 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -14,7 +14,7 @@
#include <rte_errno.h>
#include "base/dlb2_regs_new.h"
-#include "base/dlb2_hw_types_new.h"
+#include "base/dlb2_hw_types.h"
#include "base/dlb2_resource.h"
#include "base/dlb2_osdep.h"
#include "dlb2_main.h"
diff --git a/drivers/event/dlb2/pf/dlb2_main.h
b/drivers/event/dlb2/pf/dlb2_main.h
index 2dfca58e3..f3bee71fb 100644
--- a/drivers/event/dlb2/pf/dlb2_main.h
+++ b/drivers/event/dlb2/pf/dlb2_main.h
@@ -15,7 +15,7 @@
#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
#endif
-#include "base/dlb2_hw_types_new.h"
+#include "base/dlb2_hw_types.h"
#include "../dlb2_user.h"
#define DLB2_DEFAULT_UNREGISTER_TIMEOUT_S 5
diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c
index c4c776e83..a937d0f9c 100644
--- a/drivers/event/dlb2/pf/dlb2_pf.c
+++ b/drivers/event/dlb2/pf/dlb2_pf.c
@@ -35,7 +35,7 @@
#include "../dlb2_iface.h"
#include "../dlb2_inline_fns.h"
#include "dlb2_main.h"
-#include "base/dlb2_hw_types_new.h"
+#include "base/dlb2_hw_types.h"
#include "base/dlb2_osdep.h"
#include "base/dlb2_resource.h"
--
2.23.0
