Merge branch 'master' of github.com:PX4/Firmware

This commit is contained in:
Lorenz Meier 2014-03-04 21:36:15 +01:00
commit 86c80678ae
1 changed files with 3 additions and 3 deletions

View File

@ -306,7 +306,7 @@ CONFIG_UART5_RXDMA=y
# CONFIG_USART6_RS485 is not set # CONFIG_USART6_RS485 is not set
CONFIG_USART6_RXDMA=y CONFIG_USART6_RXDMA=y
# CONFIG_UART7_RS485 is not set # CONFIG_UART7_RS485 is not set
# CONFIG_UART7_RXDMA is not set CONFIG_UART7_RXDMA=y
# CONFIG_UART8_RS485 is not set # CONFIG_UART8_RS485 is not set
CONFIG_UART8_RXDMA=y CONFIG_UART8_RXDMA=y
CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_SERIAL_DISABLE_REORDERING=y
@ -539,8 +539,8 @@ CONFIG_SERIAL_NPOLLWAITERS=2
# CONFIG_USART3_SERIAL_CONSOLE is not set # CONFIG_USART3_SERIAL_CONSOLE is not set
# CONFIG_UART4_SERIAL_CONSOLE is not set # CONFIG_UART4_SERIAL_CONSOLE is not set
# CONFIG_USART6_SERIAL_CONSOLE is not set # CONFIG_USART6_SERIAL_CONSOLE is not set
# CONFIG_UART7_SERIAL_CONSOLE is not set CONFIG_UART7_SERIAL_CONSOLE=y
CONFIG_UART8_SERIAL_CONSOLE=y # CONFIG_UART8_SERIAL_CONSOLE is not set
# CONFIG_NO_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set
# #