diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-12 23:23:07 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-12 23:23:07 -0800 |
commit | bccd476316b804bcb04970686bede76a3fbff2be (patch) | |
tree | a98e66dd9bb6274d92d010ad41eeff2de990f8d5 | |
parent | 75d4f3c6c359d26fa9a4493162bc256ea4d69d37 (diff) | |
download | ltsi-kernel-bccd476316b804bcb04970686bede76a3fbff2be.tar.gz |
add android to the build
-rw-r--r-- | patches.android/staging-android-add-the-code-back-to-the-build.patch | 36 | ||||
-rw-r--r-- | series | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.android/staging-android-add-the-code-back-to-the-build.patch b/patches.android/staging-android-add-the-code-back-to-the-build.patch new file mode 100644 index 0000000000000..0c861b9d39f84 --- /dev/null +++ b/patches.android/staging-android-add-the-code-back-to-the-build.patch @@ -0,0 +1,36 @@ +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/ ++ @@ -50,6 +50,7 @@ patches.android/android-0038-Staging-android-binder-Fix-crashes-when-sharing-a-b patches.android/android-0039-staging-android-lowmemorykiller-Don-t-wait-more-than-one-sec.patch patches.android/android-0040-staging-android-ram_console-Don-t-build-on-arches-w-o-iorema.patch +patches.android/staging-android-add-the-code-back-to-the-build.patch # # LTTNG |