From 1b38cf715d85b15f2200d49b64fbe22a05b71937 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Mon, 15 Jul 2013 22:15:15 +0200
Subject: Renamed actuator_safety back to actuator_armed, compiling but
 untested

---
 src/modules/mavlink/orb_topics.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/modules/mavlink/orb_topics.h')

diff --git a/src/modules/mavlink/orb_topics.h b/src/modules/mavlink/orb_topics.h
index 3b968b911..506f73105 100644
--- a/src/modules/mavlink/orb_topics.h
+++ b/src/modules/mavlink/orb_topics.h
@@ -60,7 +60,7 @@
 #include <uORB/topics/actuator_outputs.h>
 #include <uORB/topics/actuator_controls_effective.h>
 #include <uORB/topics/actuator_controls.h>
-#include <uORB/topics/actuator_safety.h>
+#include <uORB/topics/actuator_armed.h>
 #include <uORB/topics/manual_control_setpoint.h>
 #include <uORB/topics/telemetry_status.h>
 #include <uORB/topics/debug_key_value.h>
@@ -79,6 +79,7 @@ struct mavlink_subscriptions {
 	int man_control_sp_sub;
 	int safety_sub;
 	int actuators_sub;
+	int armed_sub;
 	int local_pos_sub;
 	int spa_sub;
 	int spl_sub;
-- 
cgit v1.2.3