aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4fmu-v2/nsh/defconfig
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-04-27 22:33:32 +0200
committerLorenz Meier <lm@inf.ethz.ch>2015-04-27 22:33:32 +0200
commitf56efaf149807cbdc559a88df1abcf9bb13b9364 (patch)
tree7bf56e57c71bcfedc47a7af9be4bab290beb21da /nuttx-configs/px4fmu-v2/nsh/defconfig
parent8595c734e646f22226672e0e06b6c38e0d80cb20 (diff)
parentbd1c3363df44170523c68fd87ee19f2582a5e8fc (diff)
downloadpx4-firmware-f56efaf149807cbdc559a88df1abcf9bb13b9364.tar.gz
px4-firmware-f56efaf149807cbdc559a88df1abcf9bb13b9364.tar.bz2
px4-firmware-f56efaf149807cbdc559a88df1abcf9bb13b9364.zip
Merge branch 'master' into stablestable
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 d331aa26a..4ccc5dacb 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -439,7 +439,7 @@ CONFIG_SIG_SIGWORK=4
CONFIG_MAX_TASKS=32
CONFIG_MAX_TASK_ARGS=10
CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=44
+CONFIG_NFILE_DESCRIPTORS=42
CONFIG_NFILE_STREAMS=8
CONFIG_NAME_MAX=32
CONFIG_PREALLOC_MQ_MSGS=4