Merged master

This commit is contained in:
Lorenz Meier
2013-08-04 23:50:23 +02:00
2 changed files with 193 additions and 1 deletions
+1 -1
View File
@@ -264,7 +264,7 @@ CONFIG_STM32_USART=y
# U[S]ART Configuration
#
# CONFIG_USART1_RS485 is not set
CONFIG_USART1_RXDMA=y
# CONFIG_USART1_RXDMA is not set
# CONFIG_USART2_RS485 is not set
CONFIG_USART2_RXDMA=y
# CONFIG_USART3_RXDMA is not set