From be1fd147fcf442681eeda08e3c1bdaebcbbb8749 Mon Sep 17 00:00:00 2001
From: Michael du Breuil <wicked.shell.scripts@gmail.com>
Date: Mon, 6 Mar 2017 16:14:45 -0700
Subject: [PATCH] Arming: Remove the SITL protection around GPS configuration,
 and rely upon the GPS library instead

---
 libraries/AP_Arming/AP_Arming.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp
index cb8f299f74..7095177d8c 100644
--- a/libraries/AP_Arming/AP_Arming.cpp
+++ b/libraries/AP_Arming/AP_Arming.cpp
@@ -357,7 +357,6 @@ bool AP_Arming::gps_checks(bool report)
         }
     }
 
-#if CONFIG_HAL_BOARD != HAL_BOARD_SITL
     if ((checks_to_perform & ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_GPS_CONFIG)) {
         uint8_t first_unconfigured = gps.first_unconfigured_gps();
         if (first_unconfigured != AP_GPS::GPS_ALL_CONFIGURED) {
@@ -370,7 +369,6 @@ bool AP_Arming::gps_checks(bool report)
             return false;
         }
     }
-#endif
     return true;
 }