OSDN Git Service

ion: msm: fix Makefile dependencies
authorJeremy Gebben <jgebben@codeaurora.org>
Wed, 10 Feb 2016 17:45:46 +0000 (10:45 -0700)
committerDavid Keitel <dkeitel@codeaurora.org>
Tue, 22 Mar 2016 18:07:52 +0000 (11:07 -0700)
ion_cma_heap.o, ion_cma_secure_heap.o, and ion_system_secure_heap.o
all call functions which are only available if CONFIG_MSM_ION
is enabled.

Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
drivers/staging/android/ion/Makefile

index 6d4e675..5ce962d 100644 (file)
@@ -1,6 +1,8 @@
 obj-$(CONFIG_ION) +=   ion.o ion_heap.o ion_page_pool.o ion_system_heap.o \
-                       ion_carveout_heap.o ion_chunk_heap.o ion_system_secure_heap.o
+                       ion_carveout_heap.o ion_chunk_heap.o
+ifdef CONFIG_ION_MSM
 obj-$(CONFIG_CMA) += ion_cma_heap.o ion_cma_secure_heap.o
+endif
 obj-$(CONFIG_ION_TEST) += ion_test.o
 ifdef CONFIG_COMPAT
 obj-$(CONFIG_ION) += compat_ion.o
@@ -8,3 +10,4 @@ endif
 obj-$(CONFIG_ION_DUMMY) += ion_dummy_driver.o
 obj-$(CONFIG_ION_TEGRA) += tegra/
 obj-$(CONFIG_ION_MSM) += msm/
+obj-$(CONFIG_ION_MSM) += ion_system_secure_heap.o