aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_att_control
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-05-09 21:36:43 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-05-09 21:36:43 +0200
commit3e3a64f0eda20613aad77c13e4e8e0a2dde89baa (patch)
tree78867854173ca2ed728b4c97d8c6eece4fff304d /src/modules/fw_att_control
parent23937150bce38463612ac170803a06a3424d480d (diff)
parentfc4c4c0bd1654c2bee929c8cebb90d6bf2352d13 (diff)
downloadpx4-firmware-3e3a64f0eda20613aad77c13e4e8e0a2dde89baa.tar.gz
px4-firmware-3e3a64f0eda20613aad77c13e4e8e0a2dde89baa.tar.bz2
px4-firmware-3e3a64f0eda20613aad77c13e4e8e0a2dde89baa.zip
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
Diffstat (limited to 'src/modules/fw_att_control')
-rw-r--r--src/modules/fw_att_control/fw_att_control_main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/fw_att_control/fw_att_control_main.cpp b/src/modules/fw_att_control/fw_att_control_main.cpp
index 81bef0db3..9c9989316 100644
--- a/src/modules/fw_att_control/fw_att_control_main.cpp
+++ b/src/modules/fw_att_control/fw_att_control_main.cpp
@@ -273,7 +273,7 @@ private:
/**
* Main sensor collection task.
*/
- void task_main() __attribute__((noreturn));
+ void task_main();
};
namespace att_control