From: John Stultz <john.stultz@linaro.org>
Date: Sat, 14 Dec 2013 20:06:46 +0000 (-0800)
Subject: ion: Reenable the build
X-Git-Tag: v3.14-rc1~13^2~368
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=24b3aa09970304ece816e73c3d7174d0dd315b98;p=cascardo%2Flinux.git

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 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