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>

diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 29c5ff05abe4d783e272020fb97b9e18aba46146..0a01e1914905fc2e2d9b793706b665c2dbc10509 100644 (file)
--- 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