From b4c5041aadcf526475fca0fe450486bb2ba70e9f Mon Sep 17 00:00:00 2001
From: Michael du Breuil <wicked.shell.scripts@gmail.com>
Date: Fri, 28 Dec 2018 21:49:41 -0700
Subject: [PATCH] Sub: Remove unneeded GCS rally override

---
 ArduSub/GCS_Mavlink.cpp | 9 ---------
 ArduSub/GCS_Mavlink.h   | 2 --
 2 files changed, 11 deletions(-)

diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp
index 466279e295..52410a6cc0 100644
--- a/ArduSub/GCS_Mavlink.cpp
+++ b/ArduSub/GCS_Mavlink.cpp
@@ -1163,15 +1163,6 @@ void Sub::mavlink_delay_cb()
     DataFlash.EnableWrites(true);
 }
 
-AP_Rally *GCS_MAVLINK_Sub::get_rally() const
-{
-#if AC_RALLY == ENABLED
-    return &sub.rally;
-#else
-    return nullptr;
-#endif
-}
-
 MAV_RESULT GCS_MAVLINK_Sub::handle_flight_termination(const mavlink_command_long_t &packet) {
     if (packet.param1 > 0.5f) {
         sub.init_disarm_motors();
diff --git a/ArduSub/GCS_Mavlink.h b/ArduSub/GCS_Mavlink.h
index ca66f6557c..fd4b6e7442 100644
--- a/ArduSub/GCS_Mavlink.h
+++ b/ArduSub/GCS_Mavlink.h
@@ -12,8 +12,6 @@ protected:
         return 0;
     };
 
-    AP_Rally *get_rally() const override;
-
     MAV_RESULT handle_flight_termination(const mavlink_command_long_t &packet) override;
 
     uint8_t sysid_my_gcs() const override;