Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / include / media / davinci / vpbe_types.h

diff --git a/include/media/davinci/vpbe_types.h b/include/media/davinci/vpbe_types.h
index 9b85396514be33390705fdc34c4bad826fd609e1..05dbe0ba514c0bc3e657df60d5c15258b7a9dcf5 100644 (file)
--- 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,
 };