diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-30 06:33:10 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-30 06:33:10 -0500 |
| commit | f4dc23861d9da89cfb5d2b0c5b3c96c115842a6c (patch) | |
| tree | c4d633e78afba2604e9609e1e389f055ba029831 | |
| parent | e59bbb8ea3fb5794c09e48490a74b673aee4adc2 (diff) | |
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>
| -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 6695644fac6..e68b501314f 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
| @@ -134,4 +134,6 @@ source "drivers/staging/media/Kconfig" | |||
| 134 | 134 | ||
| 135 | source "drivers/staging/omapdrm/Kconfig" | 135 | source "drivers/staging/omapdrm/Kconfig" |
| 136 | 136 | ||
| 137 | source "drivers/staging/android/Kconfig" | ||
| 138 | |||
| 137 | endif # STAGING | 139 | endif # STAGING |
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index eba8ef6de51..6e615b692ad 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
| @@ -58,3 +58,4 @@ obj-$(CONFIG_DRM_PSB) += gma500/ | |||
| 58 | obj-$(CONFIG_INTEL_MEI) += mei/ | 58 | obj-$(CONFIG_INTEL_MEI) += mei/ |
| 59 | obj-$(CONFIG_MFD_NVEC) += nvec/ | 59 | obj-$(CONFIG_MFD_NVEC) += nvec/ |
| 60 | obj-$(CONFIG_DRM_OMAP) += omapdrm/ | 60 | obj-$(CONFIG_DRM_OMAP) += omapdrm/ |
| 61 | obj-$(CONFIG_ANDROID) += android/ | ||