commit f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c
author Greg Kroah-Hartman <gregkh@suse.de> Wed Nov 30 20:33:10 2011 +0900
committer Greg Kroah-Hartman <gregkh@suse.de> Wed Nov 30 20:33:10 2011 +0900
tree c4d633e78afba2604e9609e1e389f055ba029831
parent e59bbb8ea3fb5794c09e48490a74b673aee4adc2

Staging: android: add the code back to the build

It builds, so ship it!

Cc: Arve Hjønnevåg <arve@android.com>
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index eba8ef6..6e615b6 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -58,3 +58,4 @@
 obj-$(CONFIG_INTEL_MEI)		+= mei/
 obj-$(CONFIG_MFD_NVEC)		+= nvec/
 obj-$(CONFIG_DRM_OMAP)		+= omapdrm/
+obj-$(CONFIG_ANDROID)		+= android/