summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-10-14 15:18:54 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-10-14 15:18:54 -0700
commit437ae2287e43a6c6d51da3fb87c5dd6a1975b843 (patch)
tree32e37eb981f8c6796b02be3657e7563963e6333b
parentb483a685790f3df3bd458320691b47fa34b870a9 (diff)
Update android_*_defconfigs to support UVClinux-linaro-3.1-2011.10-0-android-2
Vishal requested the following options be enabled on the android configs: CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_USB_VIDEO_CLASS=y So this patch enables them where necessary. Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--arch/arm/configs/android_imx5_defconfig1
-rw-r--r--arch/arm/configs/android_omap3_defconfig3
-rw-r--r--arch/arm/configs/android_omap4_defconfig3
-rw-r--r--arch/arm/configs/android_origen_defconfig1
4 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/android_imx5_defconfig b/arch/arm/configs/android_imx5_defconfig
index e3422ca544a..db2d7eea0dd 100644
--- a/arch/arm/configs/android_imx5_defconfig
+++ b/arch/arm/configs/android_imx5_defconfig
@@ -162,6 +162,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_MC13892=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y
+CONFIG_USB_VIDEO_CLASS=y
CONFIG_FB=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/arch/arm/configs/android_omap3_defconfig b/arch/arm/configs/android_omap3_defconfig
index 484884ed583..2282ae1f7a6 100644
--- a/arch/arm/configs/android_omap3_defconfig
+++ b/arch/arm/configs/android_omap3_defconfig
@@ -133,6 +133,9 @@ CONFIG_TWL4030_WATCHDOG=y
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_TPS65023=y
CONFIG_REGULATOR_TPS6507X=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_DEV=y
+CONFIG_USB_VIDEO_CLASS=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_MODE_HELPERS=y
diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig
index a1a9e70823f..b80ac84aa88 100644
--- a/arch/arm/configs/android_omap4_defconfig
+++ b/arch/arm/configs/android_omap4_defconfig
@@ -132,6 +132,9 @@ CONFIG_TWL4030_WATCHDOG=y
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_TPS65023=y
CONFIG_REGULATOR_TPS6507X=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_DEV=y
+CONFIG_USB_VIDEO_CLASS=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_MODE_HELPERS=y
diff --git a/arch/arm/configs/android_origen_defconfig b/arch/arm/configs/android_origen_defconfig
index 0d76d4524e5..2fcd1088213 100644
--- a/arch/arm/configs/android_origen_defconfig
+++ b/arch/arm/configs/android_origen_defconfig
@@ -143,6 +143,7 @@ CONFIG_VIDEO_DEV=y
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
CONFIG_VIDEO_FIXED_MINOR_RANGES=y
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_USB_VIDEO_CLASS=y
CONFIG_DRM=y
CONFIG_ION=y
CONFIG_VIDEO_OUTPUT_CONTROL=y