From 4a9e5941b60ccb16cbe3c4d38464b5c7119e6699 Mon Sep 17 00:00:00 2001
From: Dennis Mannhart <dennis@px4.io>
Date: Fri, 6 Apr 2018 09:59:22 +0200
Subject: [PATCH] mc_pos_control and FlightTaskAuto rebase fix

---
 src/lib/FlightTasks/tasks/FlightTaskAuto.cpp | 1 -
 src/lib/FlightTasks/tasks/FlightTaskAuto.hpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp b/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp
index 3f3bd62058..f1b1455819 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp
@@ -178,7 +178,6 @@ void FlightTaskAuto::_evaluateVehicleGlobalPosition()
 
 	// check if reference has changed and update.
 	if (_sub_vehicle_local_position->get().ref_timestamp != _time_stamp_reference) {
-		PX4_INFO("inside");
 		map_projection_init(&_reference_position,
 				    _sub_vehicle_local_position->get().ref_lat,
 				    _sub_vehicle_local_position->get().ref_lon);
diff --git a/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp b/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp
index a5924c998c..db7a601f10 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp
@@ -42,7 +42,7 @@
 #include "FlightTask.hpp"
 #include <uORB/topics/position_setpoint_triplet.h>
 #include <uORB/topics/position_setpoint.h>
-#include <lib/geo/geo.h>
+#include <lib/ecl/geo/geo.h>
 
 /**
  * This enum has to agree with position_setpoint_s type definition