Commit f4dc2386 authored Nov 30, 2011 by Greg Kroah-Hartman

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>

parent e59bbb8e

drivers/staging/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -134,4 +134,6 @@ source "drivers/staging/media/Kconfig"

		source "drivers/staging/omapdrm/Kconfig"

		source "drivers/staging/android/Kconfig"

		endif # STAGING

drivers/staging/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -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/