aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4fmu-v1
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-04 23:50:23 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-04 23:50:23 +0200
commitb6ceba4c0af5201e6b27c9c4b839bd67429abd49 (patch)
treeff722f0328c8dca77df910218e7bcb9ff03f6471 /nuttx-configs/px4fmu-v1
parent8b4413f3b1309deff41ff98c457d2e9abe7817d1 (diff)
parent9bcabc5ba90d225f63e16f00595682fd4a4b857a (diff)
downloadpx4-firmware-b6ceba4c0af5201e6b27c9c4b839bd67429abd49.tar.gz
px4-firmware-b6ceba4c0af5201e6b27c9c4b839bd67429abd49.tar.bz2
px4-firmware-b6ceba4c0af5201e6b27c9c4b839bd67429abd49.zip
Merged master
Diffstat (limited to 'nuttx-configs/px4fmu-v1')
-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 dc884413a..129d92149 100644
--- a/nuttx-configs/px4fmu-v1/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v1/nsh/defconfig
@@ -264,7 +264,7 @@ CONFIG_STM32_USART=y
# U[S]ART Configuration
#
# CONFIG_USART1_RS485 is not set
-CONFIG_USART1_RXDMA=y
+# CONFIG_USART1_RXDMA is not set
# CONFIG_USART2_RS485 is not set
CONFIG_USART2_RXDMA=y
# CONFIG_USART3_RXDMA is not set