From: Stephen Warren Date: Fri, 21 Mar 2014 20:56:58 +0000 (-0600) Subject: ARM: update multi_v7_defconfig for Tegra X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0c86f089e66a9323d39ecb89d77190ca70b30931;p=linux-beck.git ARM: update multi_v7_defconfig for Tegra This patch adds the same options to multi_v7_defconfig as were added to tegra_defconfig in commit d1c912c1001f "ARM: tegra: defconfig updates". (CONFIG_POWER_RESET_AS3722 is already enabled here.) Suggested-by: Olof Johansson Signed-off-by: Stephen Warren Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 835c788953d7..ee5f0ebce33f 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -101,6 +101,7 @@ CONFIG_RFKILL_GPIO=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=64 CONFIG_OMAP_OCP2SCP=y CONFIG_MTD=y CONFIG_MTD_M25P80=y @@ -169,6 +170,7 @@ CONFIG_SERIAL_ST_ASC=y CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_MUX_PINCTRL=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_MV64XXX=y @@ -225,6 +227,8 @@ CONFIG_REGULATOR_VEXPRESS=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_USB_GSPCA=y CONFIG_DRM=y CONFIG_DRM_TEGRA=y CONFIG_DRM_PANEL_SIMPLE=y