summaryrefslogtreecommitdiff
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-11-30 20:33:10 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-30 20:33:10 +0900
commitf4dc23861d9da89cfb5d2b0c5b3c96c115842a6c (patch)
treec4d633e78afba2604e9609e1e389f055ba029831 /drivers/staging/Makefile
parente59bbb8ea3fb5794c09e48490a74b673aee4adc2 (diff)
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>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index eba8ef6de518..6e615b692ad6 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -58,3 +58,4 @@ obj-$(CONFIG_DRM_PSB) += gma500/
obj-$(CONFIG_INTEL_MEI) += mei/
obj-$(CONFIG_MFD_NVEC) += nvec/
obj-$(CONFIG_DRM_OMAP) += omapdrm/
+obj-$(CONFIG_ANDROID) += android/