fixes after rebase

src/drivers/camera_capture/camera_capture.hpp

@@ -55,7 +55,6 @@
 #include <px4_workqueue.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_gpio.h>
 #include <drivers/drv_pwm_output.h>
 #include <drivers/drv_input_capture.h>
 #include <drivers/device/ringbuffer.h>
@@ -65,6 +64,8 @@
 #include <uORB/topics/vehicle_command.h>
 #include <uORB/topics/vehicle_command_ack.h>
 
+#define PX4FMU_DEVICE_PATH	"/dev/px4fmu"
+
 class CameraCapture
 {
 public:

src/drivers/px4fmu/fmu.cpp

@@ -2543,7 +2543,6 @@ PX4FMU::fmu_new_mode(PortMode new_mode)
 	case PORT_PWM4CAP2:
 		/* select 4-pin PWM mode 2 capture */
 		servo_mode = PX4FMU::MODE_4PWM2CAP;
-		mode_with_input = true;
 		break;
 
 #  endif