From a5af0262f40e4bad704c44509cebd2390e49d657 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 15 Feb 2013 15:10:45 -0300
Subject: [PATCH] --- yaml --- r: 366575 b: refs/heads/master c:
 20a005a62a2497552ccd2dc3782814093facc6c8 h: refs/heads/master i:   366573:
 3a4898bd97abefb872c5bd23b4b4233035ad1f8d   366571:
 55244666ce0b6eaefa2ebcfb12225101c7e7af81   366567:
 2b4aa887e0177e7049a00eb5fffc7cc45fd83237   366559:
 2af5890e5a1fb5616b5441263e2dc3d55e133eb6 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f334453a4d89..13c635f2da1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef2d41b19b8100ce63eabba9ee87953aa685921a
+refs/heads/master: 20a005a62a2497552ccd2dc3782814093facc6c8
diff --git a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c
index de7adff324dc..fc4871ac1c2c 100644
--- a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -514,7 +514,7 @@ static const struct vpif_output dm6467_ch0_outputs[] = {
 			.index = 1,
 			.name = "Component",
 			.type = V4L2_OUTPUT_TYPE_ANALOG,
-			.capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS,
+			.capabilities = V4L2_OUT_CAP_DV_TIMINGS,
 		},
 		.subdev_name = "adv7343",
 		.output_route = ADV7343_COMPONENT_ID,