Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53650353 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: ignore ion_cma_heap if CONFIG_ION is disabled"

parents 9c70a61e cd6bc117
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
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
obj-$(CONFIG_CMA) += ion_cma_heap.o ion_cma_secure_heap.o
ifeq ($(CONFIG_CMA),y)
obj-$(CONFIG_ION) += 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