1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 8d8011998855..53f70cf02b4b 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -266,7 +266,7 @@ free_heap:
         return ERR_PTR(-ENOMEM);
 }
 
-static int ion_system_heap_create(void)
+int ion_system_heap_create(void)
 {
         struct ion_heap *heap;
 
@@ -279,7 +279,6 @@ static int ion_system_heap_create(void)
 
         return 0;
 }
-device_initcall(ion_system_heap_create);
 
 static int ion_system_contig_heap_allocate(struct ion_heap *heap,
                                            struct ion_buffer *buffer,
@@ -362,7 +361,7 @@ static struct ion_heap *__ion_system_contig_heap_create(void)
         return heap;
 }
 
-static int ion_system_contig_heap_create(void)
+int ion_system_contig_heap_create(void)
 {
         struct ion_heap *heap;
 
@@ -374,4 +373,8 @@ static int ion_system_contig_heap_create(void)
 
         return 0;
 }
+
+#ifndef CONFIG_ION_MODULE
 device_initcall(ion_system_contig_heap_create);
+device_initcall(ion_system_heap_create);
+#endif