Merged master

This commit is contained in:
Lorenz Meier
2013-08-17 20:30:52 +02:00
4 changed files with 330 additions and 225 deletions

View File

@@ -268,7 +268,7 @@ CONFIG_USART2_RXDMA=y
# CONFIG_USART3_RXDMA is not set
# CONFIG_UART4_RXDMA is not set
# CONFIG_UART5_RS485 is not set
CONFIG_UART5_RXDMA=y
CONFIG_UART5_RXDMA=n
# CONFIG_USART6_RS485 is not set
CONFIG_USART6_RXDMA=y
# CONFIG_USART7_RXDMA is not set