Merge remote-tracking branch 'origin/develop' into xap

builddefs/common_features.mk

@@ -829,9 +829,9 @@ endif
 
 ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
     PS2_ENABLE := yes
+    MOUSE_ENABLE := yes
     SRC += ps2_mouse.c
     OPT_DEFS += -DPS2_MOUSE_ENABLE
-    OPT_DEFS += -DMOUSE_ENABLE
 endif
 
 VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor

drivers/ps2/ps2_interrupt.c

@@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 // chibiOS headers
 #    include "ch.h"
 #    include "hal.h"
+#    include "gpio.h"
 #endif
 
 #include "ps2.h"

platforms/chibios/drivers/ps2/ps2_io.c

@@ -4,6 +4,7 @@
 // chibiOS headers
 #include "ch.h"
 #include "hal.h"
+#include "gpio.h"
 
 /* Check port settings for clock and data line */
 #if !(defined(PS2_CLOCK_PIN))