diff options
| author | Jeremy Gebben <jgebben@codeaurora.org> | 2016-02-10 10:45:46 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:07:52 -0700 |
| commit | b28215f0011c7a93e019e4959b12c82d9d196ad8 (patch) | |
| tree | e8b48b9e037e760128fe5cde49724a38ca68a777 | |
| parent | 74bcc31ab901d535f3af9ff3810649469914cf3d (diff) | |
ion: msm: fix Makefile dependencies
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>
| -rw-r--r-- | drivers/staging/android/ion/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index 6d4e67529ed2..5ce962dcc405 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -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 |