Linux: minor fixups for rebase to master

These changes were required after the rebase to master.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

src/drivers/drv_gpio.h

@@ -120,7 +120,7 @@
 
 #if !defined(CONFIG_ARCH_BOARD_PX4IO_V1) && !defined(CONFIG_ARCH_BOARD_PX4IO_V2)  && \
 	!defined(CONFIG_ARCH_BOARD_PX4FMU_V1) && !defined(CONFIG_ARCH_BOARD_PX4FMU_V2) && \
-	!defined(CONFIG_ARCH_BOARD_AEROCORE) && !defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) \
+	!defined(CONFIG_ARCH_BOARD_AEROCORE) && !defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \
 	!defined(CONFIG_ARCH_BOARD_LINUXTEST)
 # error No CONFIG_ARCH_BOARD_xxxx set
 #endif

src/drivers/hil/hil_linux.cpp

@@ -401,7 +401,7 @@ HIL::task_main()
 			if (_mixers != nullptr) {
 
 				/* do mixing */
-				outputs.noutputs = _mixers->mix(&outputs.output[0], num_outputs);
+				outputs.noutputs = _mixers->mix(&outputs.output[0], num_outputs, NULL);
 				outputs.timestamp = hrt_absolute_time();
 
 				/* iterate actuators */