From 3a0812508b4db5051bd7e14f252798ecbb607fb2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 17 Jan 2015 14:19:25 -0600
Subject: [PATCH] Spark: Certain combinations of conditional compilation
 results in compilation errors

---
 configs/spark/src/up_spi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/spark/src/up_spi.c b/configs/spark/src/up_spi.c
index c24c2caebf..5c2492c236 100644
--- a/configs/spark/src/up_spi.c
+++ b/configs/spark/src/up_spi.c
@@ -157,14 +157,17 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+
 #if defined(CONFIG_MTD_SST25)
 
   if (devid == SPIDEV_FLASH)
     {
       stm32_gpiowrite(GPIO_MEM_CS, !selected);
     }
+if defined(CONFIG_WL_CC3000)
   else
 #endif
+#endif
 
 #if defined(CONFIG_WL_CC3000)
   if (devid == SPIDEV_WIRELESS)