From 32bc17aa0a0d9f31416093b602c8eb76faa7696b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 Nov 2011 20:33:10 +0900 Subject: [PATCH] --- yaml --- r: 281198 b: refs/heads/master c: f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/Kconfig | 2 ++ trunk/drivers/staging/Makefile | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8aba235fafc0..b9f67a22ec03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e59bbb8ea3fb5794c09e48490a74b673aee4adc2 +refs/heads/master: f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig index 6695644fac63..e68b501314f7 100644 --- a/trunk/drivers/staging/Kconfig +++ b/trunk/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/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index eba8ef6de518..6e615b692ad6 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/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/