aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-04 22:01:50 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-04 22:01:50 +0000
commit61137a3d22e3a545270f18afba55e63a187c870f (patch)
treeb31e348b85796450b7bb1f3a0a0ae884efc1fbba
parentc8c29e73a870c8eca24a135fa0c490fd6fa6db4e (diff)
downloadpx4-firmware-61137a3d22e3a545270f18afba55e63a187c870f.tar.gz
px4-firmware-61137a3d22e3a545270f18afba55e63a187c870f.tar.bz2
px4-firmware-61137a3d22e3a545270f18afba55e63a187c870f.zip
Fix compile error introduced by recent check-in
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4369 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-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