summaryrefslogtreecommitdiff
path: root/drivers/staging/android/Makefile
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-12-14 12:06:46 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-15 09:40:11 -0800
commit24b3aa09970304ece816e73c3d7174d0dd315b98 (patch)
tree2f9dd37e17d34a1064313b174be204aff826f8d0 /drivers/staging/android/Makefile
parent968141d2541fea22f921bf643636b3b51177336c (diff)
ion: Reenable the build
Now that ION builds, reenable it in the build. 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/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 29c5ff05abe4..0a01e1914905 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -1,7 +1,6 @@
ccflags-y += -I$(src) # needed for trace events
-# ION doesn't build just yet, so disable it from the build
-#obj-y += ion/
+obj-y += ion/
obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o
obj-$(CONFIG_ASHMEM) += ashmem.o