From b044fac4b6f8dbd23bd05ee2bf422cd072b0db19 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Fri, 22 Jul 2016 11:22:14 -0300
Subject: [PATCH] AP_HAL_Linux: rename variable to follow I2CDevice convention

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

diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
index c78171f64d6..60f9b50297c 100644
--- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
+++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
@@ -45,8 +45,8 @@ static UARTDriver uartEDriver(false);
 static UARTDriver uartFDriver(false);
 
 static I2CDeviceManager i2c_mgr_instance;
+static SPIDeviceManager spi_mgr_instance;
 
-static SPIDeviceManager spiDeviceManager;
 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || \
     CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2 || \
     CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BH || \
@@ -186,7 +186,7 @@ HAL_Linux::HAL_Linux() :
         &uartEDriver,
         &uartFDriver,
         &i2c_mgr_instance,
-        &spiDeviceManager,
+        &spi_mgr_instance,
         &analogIn,
         &storageDriver,
         &uartADriver,