From ed8cf898888dfbb616d6c4e7918688fea8ece922 Mon Sep 17 00:00:00 2001
From: Oleg Semyonov <os@openpilot.org>
Date: Wed, 28 Sep 2011 22:57:18 +0300
Subject: [PATCH] Initcall: fix compilation errors for firmware which does not
 use Initcalls

---
 flight/CopterControl/System/inc/pios_config.h | 3 +++
 flight/OpenPilot/System/inc/pios_config.h     | 2 ++
 flight/OpenPilot/UAVObjects.inc               | 1 -
 flight/PiOS/pios.h                            | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/flight/CopterControl/System/inc/pios_config.h b/flight/CopterControl/System/inc/pios_config.h
index b7528c401..a367f2e2d 100644
--- a/flight/CopterControl/System/inc/pios_config.h
+++ b/flight/CopterControl/System/inc/pios_config.h
@@ -108,6 +108,9 @@
 // This can't be too high to stop eventdispatcher thread overflowing
 #define PIOS_EVENTDISAPTCHER_QUEUE      10
 
+/* PIOS Initcall infrastructure */
+#define PIOS_INCLUDE_INITCALL
+
 #endif /* PIOS_CONFIG_H */
 /**
  * @}
diff --git a/flight/OpenPilot/System/inc/pios_config.h b/flight/OpenPilot/System/inc/pios_config.h
index 8e37dc95a..6339e87b0 100644
--- a/flight/OpenPilot/System/inc/pios_config.h
+++ b/flight/OpenPilot/System/inc/pios_config.h
@@ -98,6 +98,8 @@
 /* GPS options */
 #define PIOS_GPS_SETS_HOMELOCATION
 
+/* PIOS Initcall infrastructure */
+#define PIOS_INCLUDE_INITCALL
 
 #endif /* PIOS_CONFIG_H */
 /**
diff --git a/flight/OpenPilot/UAVObjects.inc b/flight/OpenPilot/UAVObjects.inc
index 1b110e0e9..8d5c5409f 100644
--- a/flight/OpenPilot/UAVObjects.inc
+++ b/flight/OpenPilot/UAVObjects.inc
@@ -64,7 +64,6 @@ UAVOBJSRCFILENAMES += systemalarms
 UAVOBJSRCFILENAMES += systemsettings
 UAVOBJSRCFILENAMES += systemstats
 UAVOBJSRCFILENAMES += taskinfo
-UAVOBJSRCFILENAMES += telemetrysettings
 UAVOBJSRCFILENAMES += velocityactual
 UAVOBJSRCFILENAMES += velocitydesired
 UAVOBJSRCFILENAMES += watchdogstatus
diff --git a/flight/PiOS/pios.h b/flight/PiOS/pios.h
index a675f93b1..4be0bfafc 100644
--- a/flight/PiOS/pios.h
+++ b/flight/PiOS/pios.h
@@ -59,7 +59,9 @@
 #endif
 
 /* Generic initcall infrastructure */
+#if defined(PIOS_INCLUDE_INITCALL)
 #include "pios_initcall.h"
+#endif
 
 /* PIOS Board Specific Device Configuration */
 #include "pios_board.h"