From b2d26436ded8e526aa7a72dd0ede388f854618fc Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 21 May 2014 07:20:09 -0600
Subject: [PATCH] Configuration has CC3000_SPI_MODE settings but source uses
 CONFIG_CC3000_SPIMODE. From Jussi Kivilinna

---
 drivers/wireless/cc3000/cc3000.c                    | 4 ++--
 include/nuttx/wireless/cc3000/include/cc3000_upif.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index 40394aad27..4f2115525f 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -271,9 +271,9 @@ static void usdelay(long ustimeout)
 static inline void cc3000_configspi(FAR struct spi_dev_s *spi)
 {
   ndbg("Mode: %d Bits: 8 Frequency: %d\n",
-       CONFIG_CC3000_SPIMODE, CONFIG_CC3000_SPI_FREQUENCY);
+       CONFIG_CC3000_SPI_MODE, CONFIG_CC3000_SPI_FREQUENCY);
 
-  SPI_SETMODE(spi, CONFIG_CC3000_SPIMODE);
+  SPI_SETMODE(spi, CONFIG_CC3000_SPI_MODE);
   SPI_SETBITS(spi, 8);
   SPI_SETFREQUENCY(spi, CONFIG_CC3000_SPI_FREQUENCY);
 }
diff --git a/include/nuttx/wireless/cc3000/include/cc3000_upif.h b/include/nuttx/wireless/cc3000/include/cc3000_upif.h
index 235cfe7ecb..baa144a203 100644
--- a/include/nuttx/wireless/cc3000/include/cc3000_upif.h
+++ b/include/nuttx/wireless/cc3000/include/cc3000_upif.h
@@ -75,12 +75,12 @@
 #  define CONFIG_CC3000_NPOLLWAITERS 2
 #endif
 
-#ifndef CONFIG_CC3000_SPIMODE
+#ifndef CONFIG_CC3000_SPI_MODE
 /* CPOL = 0, CPHA = 1 Sample Data Falling Edge of Clock
  * See http://processors.wiki.ti.com/index.php/CC3000_Serial_Port_Interface_(SPI)
  */
 
-#  define CONFIG_CC3000_SPIMODE SPIDEV_MODE1
+#  define CONFIG_CC3000_SPI_MODE SPIDEV_MODE1
 #endif
 
 /* Check for some required settings.  This can save the user a lot of time