summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/marzen_defconfig
diff options
context:
space:
mode:
authorVladimir Barinov <vladimir.barinov@cogentembedded.com>2013-08-22 17:27:08 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-25 07:34:52 -0300
commite0c332c671e71941e0bd4a339972ee4af15df676 (patch)
treec47b94feb70fe772ed21f29896e1998689881711 /arch/arm/configs/marzen_defconfig
parent7cef5e7fd1ab891bc59c269a1a55b8e8d8ca5bc8 (diff)
[media] ARM: shmobile: Marzen: enable VIN and ADV7180 in defconfig
Add the VIN and ADV7180 drivers to 'marzen_defconfig'. Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'arch/arm/configs/marzen_defconfig')
-rw-r--r--arch/arm/configs/marzen_defconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 494e70aeb9e..c50e52be446 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -84,6 +84,13 @@ CONFIG_GPIO_RCAR=y
CONFIG_THERMAL=y
CONFIG_RCAR_THERMAL=y
CONFIG_SSB=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_RCAR_VIN=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_VIDEO_ADV7180=y
CONFIG_USB=y
CONFIG_USB_RCAR_PHY=y
CONFIG_MMC=y