Browse Source

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>
Greg Kroah-Hartman 13 years ago
parent
commit
f4dc23861d
2 changed files with 3 additions and 0 deletions
  1. 2 0
      drivers/staging/Kconfig
  2. 1 0
      drivers/staging/Makefile

+ 2 - 0
drivers/staging/Kconfig

@@ -134,4 +134,6 @@ source "drivers/staging/media/Kconfig"
 
 source "drivers/staging/omapdrm/Kconfig"
 
+source "drivers/staging/android/Kconfig"
+
 endif # STAGING

+ 1 - 0
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/