From 437ae2287e43a6c6d51da3fb87c5dd6a1975b843 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 14 Oct 2011 15:18:54 -0700 Subject: Update android_*_defconfigs to support UVC 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 --- arch/arm/configs/android_imx5_defconfig | 1 + arch/arm/configs/android_omap3_defconfig | 3 +++ arch/arm/configs/android_omap4_defconfig | 3 +++ arch/arm/configs/android_origen_defconfig | 1 + 4 files changed, 8 insertions(+) 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 -- cgit v1.2.3