From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 30 Nov 2011 11:33:10 +0000 (+0900)
Subject: Staging: android: add the code back to the build
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 6695644fac63..e68b501314f7 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -134,4 +134,6 @@ source "drivers/staging/media/Kconfig"
 
 source "drivers/staging/omapdrm/Kconfig"
 
+source "drivers/staging/android/Kconfig"
+
 endif # STAGING
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/