aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4fmu-v2/nsh/defconfig
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-01-09 08:42:40 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-01-09 08:42:40 +0100
commitc1ecdadd9ba70c909e153040b7698d50d7e7dfeb (patch)
tree0ea73ab2cc7a029c97a32f2987960c95446a204d /nuttx-configs/px4fmu-v2/nsh/defconfig
parentc463fde0b95eb07a5f2792032d24fbda8626b808 (diff)
parent902fcf44c90d0553ece2bc524a3f07c6a69e5504 (diff)
downloadpx4-firmware-c1ecdadd9ba70c909e153040b7698d50d7e7dfeb.tar.gz
px4-firmware-c1ecdadd9ba70c909e153040b7698d50d7e7dfeb.tar.bz2
px4-firmware-c1ecdadd9ba70c909e153040b7698d50d7e7dfeb.zip
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'nuttx-configs/px4fmu-v2/nsh/defconfig')
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/defconfig2
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