From ed4b34547c1bddeb696b9e3c46bdb15407a845c9 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Tue, 3 Sep 2013 21:21:41 -0700
Subject: Make the init code compile if we don't have the granule allocator /
 dma allocator required

---
 src/drivers/boards/px4fmu-v2/px4fmu2_init.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/drivers/boards')

diff --git a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c
index c5d0377bc..ae2a645f7 100644
--- a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c
+++ b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c
@@ -78,10 +78,6 @@
 
 /* Configuration ************************************************************/
 
-#if !defined(CONFIG_GRAN) || !defined(CONFIG_FAT_DMAMEMORY)
-# error microSD DMA support requires CONFIG_GRAN and CONFIG_FAT_DMAMEMORY
-#endif
-
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
@@ -102,6 +98,11 @@
  * Protected Functions
  ****************************************************************************/
 
+#if defined(CONFIG_FAT_DMAMEMORY)
+# if !defined(CONFIG_GRAN) || !defined(CONFIG_FAT_DMAMEMORY)
+#  error microSD DMA support requires CONFIG_GRAN
+# endif
+
 static GRAN_HANDLE dma_allocator;
 
 /* 
@@ -155,6 +156,12 @@ fat_dma_free(FAR void *memory, size_t size)
 	gran_free(dma_allocator, memory, size);
 }
 
+#else
+
+# define dma_alloc_init()
+
+#endif
+
 /************************************************************************************
  * Name: stm32_boardinitialize
  *
-- 
cgit v1.2.3