aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4fmu-v1/nsh
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-17 20:30:52 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-17 20:30:52 +0200
commit061be7f7fed430d1c235809f1e1dce61e8b7aa01 (patch)
tree5964318a7902c4eeaa67f185698e6cafc25fbf08 /nuttx-configs/px4fmu-v1/nsh
parent628e806df5b05ea8a44d46f29606db03fee1fce9 (diff)
parentb08ca02410cc02f75bbfe154963edcea6767972e (diff)
downloadpx4-firmware-061be7f7fed430d1c235809f1e1dce61e8b7aa01.tar.gz
px4-firmware-061be7f7fed430d1c235809f1e1dce61e8b7aa01.tar.bz2
px4-firmware-061be7f7fed430d1c235809f1e1dce61e8b7aa01.zip
Merged master
Diffstat (limited to 'nuttx-configs/px4fmu-v1/nsh')
-rw-r--r--nuttx-configs/px4fmu-v1/nsh/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig
index a7a6725c6..861d59b4b 100644
--- a/nuttx-configs/px4fmu-v1/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v1/nsh/defconfig
@@ -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