aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/hil/hil.cpp
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-07-06 15:47:34 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-07-06 15:47:34 +0200
commit1492323f0327916435d806c2af1e0c8296278c9d (patch)
treed53e2768c326ec6a2cbcfd896550c446ba93fab3 /src/drivers/hil/hil.cpp
parent2669f7f3af65921d4abbf3850cd62e48f2eeeec7 (diff)
parentbd88951f6ce609bc5ba364bfa3d19ae61e444964 (diff)
downloadpx4-firmware-1492323f0327916435d806c2af1e0c8296278c9d.tar.gz
px4-firmware-1492323f0327916435d806c2af1e0c8296278c9d.tar.bz2
px4-firmware-1492323f0327916435d806c2af1e0c8296278c9d.zip
Merged master into uavcan
Diffstat (limited to 'src/drivers/hil/hil.cpp')
-rw-r--r--src/drivers/hil/hil.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/hil/hil.cpp b/src/drivers/hil/hil.cpp
index 0a047f38f..55cc077fb 100644
--- a/src/drivers/hil/hil.cpp
+++ b/src/drivers/hil/hil.cpp
@@ -122,7 +122,7 @@ private:
actuator_controls_s _controls;
static void task_main_trampoline(int argc, char *argv[]);
- void task_main() __attribute__((noreturn));
+ void task_main();
static int control_callback(uintptr_t handle,
uint8_t control_group,