diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-15 15:06:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-19 16:09:53 -0300 |
| commit | ef2d41b19b8100ce63eabba9ee87953aa685921a (patch) | |
| tree | e5fbedee4c7df5f62423453db180dd6c3d8e05c5 /include/media/davinci | |
| parent | 4bd3bb7129ac9a0ee3ba4b587c228f5f43b841cd (diff) | |
| download | linux-stable-ef2d41b19b8100ce63eabba9ee87953aa685921a.tar.gz linux-stable-ef2d41b19b8100ce63eabba9ee87953aa685921a.tar.bz2 linux-stable-ef2d41b19b8100ce63eabba9ee87953aa685921a.zip | |
[media] davinci: remove VPBE_ENC_DV_PRESET and rename VPBE_ENC_CUSTOM_TIMINGS
Remove VPBE_ENC_DV_PRESET (the DV_PRESET API is no longer supported) and
VPBE_ENC_CUSTOM_TIMINGS is renamed to VPBE_ENC_DV_TIMINGS since the old
"CUSTOM_TIMINGS" name is deprecated in favor of "DV_TIMINGS".
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/davinci')
| -rw-r--r-- | include/media/davinci/vpbe_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/davinci/vpbe_types.h b/include/media/davinci/vpbe_types.h index 9b85396514be..05dbe0ba514c 100644 --- a/include/media/davinci/vpbe_types.h +++ b/include/media/davinci/vpbe_types.h @@ -26,8 +26,7 @@ enum vpbe_version { /* vpbe_timing_type - Timing types used in vpbe device */ enum vpbe_enc_timings_type { VPBE_ENC_STD = 0x1, - VPBE_ENC_DV_PRESET = 0x2, - VPBE_ENC_CUSTOM_TIMINGS = 0x4, + VPBE_ENC_DV_TIMINGS = 0x4, /* Used when set timings through FB device interface */ VPBE_ENC_TIMINGS_INVALID = 0x8, }; |