| From f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@suse.de> |
| Date: Wed, 30 Nov 2011 20:33:10 +0900 |
| Subject: [PATCH] Staging: android: add the code back to the build |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| |
| --- |
| drivers/staging/Kconfig | 2 ++ |
| drivers/staging/Makefile | 2 ++ |
| 2 files changed, 4 insertions(+) |
| |
| --- a/drivers/staging/Kconfig |
| +++ b/drivers/staging/Kconfig |
| @@ -160,4 +160,6 @@ source "drivers/staging/mei/Kconfig" |
| |
| source "drivers/staging/nvec/Kconfig" |
| |
| +source "drivers/staging/android/Kconfig" |
| + |
| endif # STAGING |
| --- a/drivers/staging/Makefile |
| +++ b/drivers/staging/Makefile |
| @@ -71,3 +71,5 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_R |
| obj-$(CONFIG_DRM_PSB) += gma500/ |
| obj-$(CONFIG_INTEL_MEI) += mei/ |
| obj-$(CONFIG_MFD_NVEC) += nvec/ |
| +obj-$(CONFIG_ANDROID) += android/ |
| + |
