From 1a9b57da1f297120f67a194d08f090476c6cf081 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 3 Nov 2015 11:28:31 -0200
Subject: [PATCH] AP_GPS: remove check for GPS_SKIP_SIRF_NMEA

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

diff --git a/libraries/AP_GPS/AP_GPS.cpp b/libraries/AP_GPS/AP_GPS.cpp
index b5bab553ca..1675f90961 100644
--- a/libraries/AP_GPS/AP_GPS.cpp
+++ b/libraries/AP_GPS/AP_GPS.cpp
@@ -264,7 +264,6 @@ AP_GPS::detect_instance(uint8_t instance)
             hal.console->print(" SBP ");
             new_gps = new AP_GPS_SBP(*this, state[instance], _port[instance]);
         }
-#if !defined(GPS_SKIP_SIRF_NMEA)
 		// save a bit of code space on a 1280
 		else if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_SIRF) &&
                  AP_GPS_SIRF::_detect(dstate->sirf_detect_state, data)) {
@@ -280,7 +279,6 @@ AP_GPS::detect_instance(uint8_t instance)
 				new_gps = new AP_GPS_NMEA(*this, state[instance], _port[instance]);
 			}
 		}
-#endif
 	}
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4