diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-09 10:57:04 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-09 10:57:04 +0100 |
| commit | b076d706d996272a767767f7e55ae156be885b87 (patch) | |
| tree | 403550d156d2fdb6035ae3c59223b954ff19d452 | |
| parent | 4e4e5a0323e586e5b7c28e3fbc29ef69185518d6 (diff) | |
| parent | c1ecdadd9ba70c909e153040b7698d50d7e7dfeb (diff) | |
| download | px4-firmware-b076d706d996272a767767f7e55ae156be885b87.tar.gz px4-firmware-b076d706d996272a767767f7e55ae156be885b87.tar.bz2 px4-firmware-b076d706d996272a767767f7e55ae156be885b87.zip | |
Merge branch 'master' of github.com:PX4/Firmware into mount_tests
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 8a282693f..c0ed11a62 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -302,7 +302,7 @@ CONFIG_USART2_RXDMA=y CONFIG_USART3_RXDMA=y # CONFIG_UART4_RS485 is not set CONFIG_UART4_RXDMA=y -# CONFIG_UART5_RXDMA is not set +CONFIG_UART5_RXDMA=y # CONFIG_USART6_RS485 is not set CONFIG_USART6_RXDMA=y # CONFIG_UART7_RS485 is not set |