diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-13 18:50:12 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-13 18:50:12 +0000 |
commit | 679160a872dfe88bf34e50f1939e190ba59e534e (patch) | |
tree | fe342d02e224d006a23745a657148ce62b54fee4 /drivers/staging/android/ion/Makefile | |
parent | eed4bafd63b5584adb832a582a931ecba41dec55 (diff) | |
parent | 8f1c42284159ebd6851e1e75507f2ad6fba87d0f (diff) |
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aospv3.10/topic/aosp
Diffstat (limited to 'drivers/staging/android/ion/Makefile')
-rw-r--r-- | drivers/staging/android/ion/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index 9c956659124..75039b98eeb 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -1,5 +1,6 @@ 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_cma_heap.o +obj-$(CONFIG_ION_TEST) += ion_test.o ifdef CONFIG_COMPAT obj-$(CONFIG_ION) += compat_ion.o endif |