diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-30 20:33:10 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-30 20:33:10 +0900 |
| commit | f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c (patch) | |
| tree | c4d633e78afba2604e9609e1e389f055ba029831 /drivers/staging | |
| parent | e59bbb8ea3fb5794c09e48490a74b673aee4adc2 (diff) | |
| download | op-kernel-dev-f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c.zip op-kernel-dev-f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c.tar.gz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 6695644..e68b501 100644 --- a/drivers/staging/Kconfig +++ b/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/drivers/staging/Makefile b/drivers/staging/Makefile index eba8ef6..6e615b6 100644 --- a/drivers/staging/Makefile +++ b/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/ |
