From 26820c3a8c3535df81945b8a89c17f2f10b3836d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Fri, 18 Jun 2021 14:34:43 +1000
Subject: [PATCH] AP_Motors: fixup build for ftype conflict

---
 libraries/AP_Motors/AP_MotorsUGV.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_Motors/AP_MotorsUGV.cpp b/libraries/AP_Motors/AP_MotorsUGV.cpp
index 207fa5ec4c..f665c532e5 100644
--- a/libraries/AP_Motors/AP_MotorsUGV.cpp
+++ b/libraries/AP_Motors/AP_MotorsUGV.cpp
@@ -121,9 +121,9 @@ AP_MotorsUGV::AP_MotorsUGV(AP_ServoRelayEvents &relayEvents, AP_WheelRateControl
     _singleton = this;
 }
 
-void AP_MotorsUGV::init(uint8_t ftype)
+void AP_MotorsUGV::init(uint8_t frtype)
 {
-    _frame_type = frame_type(ftype);
+    _frame_type = frame_type(frtype);
 
     // setup servo output
     setup_servo_output();