summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-04 22:01:50 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-04 22:01:50 +0000
commit89195d1c46a0c742e74ea46e449b10b97c7b220a (patch)
treeb31e348b85796450b7bb1f3a0a0ae884efc1fbba
parente82f3f21bff1cf021e036ce3e67d5cc12eb41ebe (diff)
downloadpx4-nuttx-89195d1c46a0c742e74ea46e449b10b97c7b220a.tar.gz
px4-nuttx-89195d1c46a0c742e74ea46e449b10b97c7b220a.tar.bz2
px4-nuttx-89195d1c46a0c742e74ea46e449b10b97c7b220a.zip
Fix compile error introduced by recent check-in
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4369 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_serial.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c
index f5fc1d5da..f589f18cb 100644
--- a/nuttx/arch/arm/src/stm32/stm32_serial.c
+++ b/nuttx/arch/arm/src/stm32/stm32_serial.c
@@ -64,14 +64,12 @@
/****************************************************************************
* Definitions
****************************************************************************/
-
/* Some sanity checks *******************************************************/
-
/* Is there a USART enabled? */
-#if defined(CONFIG_STM32_USART1) && defined(CONFIG_STM32_USART2) && \
- defined(CONFIG_STM32_USART3) && defined(CONFIG_STM32_UART4) && \
- defined(CONFIG_STM32_UART5) && defined(CONFIG_STM32_USART6)
+#if defined(CONFIG_STM32_USART1) || defined(CONFIG_STM32_USART2) || \
+ defined(CONFIG_STM32_USART3) || defined(CONFIG_STM32_UART4) || \
+ defined(CONFIG_STM32_UART5) || defined(CONFIG_STM32_USART6)
# define HAVE_UART 1
#endif