aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngus Ainslie <angus.ainslie@linaro.org>2011-12-12 22:43:10 -0700
committerAngus Ainslie <angus.ainslie@linaro.org>2011-12-12 22:43:10 -0700
commit2e4eca468cbadc54e5a13da2e4debc1ed360fcb2 (patch)
treef4454ceae8be99b76a854b4f1e63ff3efed3f558
parent7b9a5447d3f1a95769a349db5e851e1216742eb5 (diff)
origen: fix tuner build failuresandroid-release-2011-12android-ics-2011-12.1
Disable building customized tuners as they make the build fail Change-Id: I3dfde86266a4a31aeabc19b113bf0d8612716b39 Signed-off-by: Angus Ainslie <angus.ainslie@linaro.org>
-rw-r--r--arch/arm/configs/android_origen_defconfig9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/configs/android_origen_defconfig b/arch/arm/configs/android_origen_defconfig
index 9fd036b7e6b7..99061b697191 100644
--- a/arch/arm/configs/android_origen_defconfig
+++ b/arch/arm/configs/android_origen_defconfig
@@ -156,6 +156,7 @@ CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_DEV=y
# CONFIG_RC_CORE is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_USB_VIDEO_CLASS=y
CONFIG_VIDEO_SAMSUNG=y
@@ -169,12 +170,8 @@ CONFIG_VIDEO_SAMSUNG_TVOUT=y
CONFIG_DRM=y
CONFIG_DRM_MALI=y
CONFIG_ION=y
-CONFIG_MALI400MP=y
-CONFIG_USING_MMU=y
-CONFIG_USING_UMP=y
-CONFIG_USING_OS_MEMORY=y
-CONFIG_UMP=y
-CONFIG_UMP_DEBUG=y
+# CONFIG_DEBUG_BUILD is not set
+# CONFIG_UMP_DEBUG is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
CONFIG_FB_S3C=y