aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-20 08:06:32 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 21:09:57 -0400
commit0d4f35f3f0044303abfff57441dd1e98f96ea935 (patch)
tree5bdae27a3bc2c84c581d973e4d34195a8a272b0b /include/media
parent882084ad0f9791f2e8386ba3f9f3836f0c3e9fa6 (diff)
[media] davinci: move struct vpif_interface to chan_cfg
struct vpif_interface is channel specific, not subdev specific. Move it to the channel config. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sekhar Nori <nsekhar@ti.com> Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com> Tested-by: Lad, Prabhakar <prabhakar.lad@ti.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/davinci/vpif_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
index a422ed085cd2..65e8fe17e116 100644
--- a/include/media/davinci/vpif_types.h
+++ b/include/media/davinci/vpif_types.h
@@ -37,7 +37,6 @@ struct vpif_interface {
37struct vpif_subdev_info { 37struct vpif_subdev_info {
38 const char *name; 38 const char *name;
39 struct i2c_board_info board_info; 39 struct i2c_board_info board_info;
40 struct vpif_interface vpif_if;
41}; 40};
42 41
43struct vpif_display_config { 42struct vpif_display_config {
@@ -59,6 +58,7 @@ struct vpif_input {
59}; 58};
60 59
61struct vpif_capture_chan_config { 60struct vpif_capture_chan_config {
61 struct vpif_interface vpif_if;
62 const struct vpif_input *inputs; 62 const struct vpif_input *inputs;
63 int input_count; 63 int input_count;
64}; 64};