[API-NEXT,05/15] merge fix: odp_schedule_if.h

Message ID 20170127142921.29029-6-maxim.uvarov@linaro.org
State New
Headers show
Series
  • Merge tag 'v1.13.0.0' into api-next
Related show

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 platform/linux-generic/include/odp_schedule_if.h | 6 ------
 1 file changed, 6 deletions(-)

-- 
2.11.0.295.gd7dffce

Patch

diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index d1cbf988..530d157f 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -35,10 +35,7 @@  typedef int (*schedule_term_local_fn_t)(void);
 typedef void (*schedule_order_lock_fn_t)(void);
 typedef void (*schedule_order_unlock_fn_t)(void);
 typedef unsigned (*schedule_max_ordered_locks_fn_t)(void);
-<<<<<<< HEAD
 typedef void (*schedule_save_context_fn_t)(queue_entry_t *queue);
-=======
->>>>>>> v1.13.0.0
 
 typedef struct schedule_fn_t {
 	schedule_pktio_start_fn_t   pktio_start;
@@ -57,10 +54,7 @@  typedef struct schedule_fn_t {
 	schedule_order_lock_fn_t    order_lock;
 	schedule_order_unlock_fn_t  order_unlock;
 	schedule_max_ordered_locks_fn_t max_ordered_locks;
-<<<<<<< HEAD
 	schedule_save_context_fn_t  save_context;
-=======
->>>>>>> v1.13.0.0
 } schedule_fn_t;
 
 /* Interface towards the scheduler */