diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-17 17:22:38 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-17 17:22:38 -0600 |
| commit | d0adfe4da59c6b5313ee8d4de11317e28fa0daf6 (patch) | |
| tree | 298d6e80b9d81567252b606d90f6cadbdd09b837 /nuttx | |
| parent | 4a213c628ebeea77711d5a6171c26654a5879a98 (diff) | |
| parent | 5b3319df4b2a353f47f9fcfbf667b9867a662dd7 (diff) | |
| download | px4-nuttx-d0adfe4da59c6b5313ee8d4de11317e28fa0daf6.tar.gz px4-nuttx-d0adfe4da59c6b5313ee8d4de11317e28fa0daf6.tar.bz2 px4-nuttx-d0adfe4da59c6b5313ee8d4de11317e28fa0daf6.zip | |
Merge remote-tracking branch 'origin/master' into ipv6
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/spark/src/up_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/configs/spark/src/up_spi.c b/nuttx/configs/spark/src/up_spi.c index 5c2492c23..494e0fdd5 100644 --- a/nuttx/configs/spark/src/up_spi.c +++ b/nuttx/configs/spark/src/up_spi.c @@ -164,7 +164,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele { stm32_gpiowrite(GPIO_MEM_CS, !selected); } -if defined(CONFIG_WL_CC3000) +#if defined(CONFIG_WL_CC3000) else #endif #endif |