diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2013-12-13 19:38:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-14 08:50:15 -0800 |
| commit | c30707be128e952ca2ba77417cb5509e254a4aac (patch) | |
| tree | f0ba5ba47d721940dffb91d1c51e1252afe937f8 /drivers/staging/android/Makefile | |
| parent | 530376bfb7c82f50f20f9d28acd017194894eb66 (diff) | |
gpu: ion: Add ION Memory Manager
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
[jstultz: Squished in Colin Cross' move to staging change,
also disables ION from the build, as it won't compile till
the end of the patchset]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/Makefile')
| -rw-r--r-- | drivers/staging/android/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile index c136299e05af..29c5ff05abe4 100644 --- a/drivers/staging/android/Makefile +++ b/drivers/staging/android/Makefile @@ -1,5 +1,8 @@ ccflags-y += -I$(src) # needed for trace events +# ION doesn't build just yet, so disable it from the build +#obj-y += ion/ + obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o obj-$(CONFIG_ASHMEM) += ashmem.o obj-$(CONFIG_ANDROID_LOGGER) += logger.o |