Merge branch 'master' into new_state_machine

compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp

1 files changed, 0 insertions, 27 deletions

diff --git a/nuttx/fs/mmap/Kconfig b/nuttx/fs/mmap/Kconfig
deleted file mode 100644
index 03482e2d8..000000000
--- a/nuttx/fs/mmap/Kconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see misc/tools/kconfig-language.txt.
-#
-
-config FS_RAMMAP
-	bool "File mapping emulation"
-	default n
-	---help---
-		NuttX operates in a flat open address space and is focused on MCUs that do
-		support Memory Management Units (MMUs).  Therefore, NuttX generally does not
-		require mmap() functionality and the MCUs generally cannot support true
-		memory-mapped files.
-
-		However, memory mapping of files is the mechanism used by NXFLAT, the NuttX
-		tiny binary format, to get files into memory in order to execute them.
-		mmap() support is therefore required to support NXFLAT.
-
-		If FS_RAMMAP is defined in the configuration, then mmap() will
-		support simulation of memory mapped files by copying files whole
-		into RAM.  These copied files have some of the properties of
-		standard memory mapped files.
-
-		See nuttx/fs/mmap/README.txt for additonal information.
-
-if FS_RAMMAP
-endif