Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / include / media / davinci / vpbe_osd.h

diff --git a/include/media/davinci/vpbe_osd.h b/include/media/davinci/vpbe_osd.h
index 42628fcfe1bd890eb20ebea9ec2073fa5bdd8137..de59364d7ed2a98263bddc76e92dd5c6414c0574 100644 (file)
--- a/include/media/davinci/vpbe_osd.h
+++ b/include/media/davinci/vpbe_osd.h
@@ -82,9 +82,9 @@ enum osd_pix_format {
        PIXFMT_4BPP,
        PIXFMT_8BPP,
        PIXFMT_RGB565,
-       PIXFMT_YCbCrI,
+       PIXFMT_YCBCRI,
        PIXFMT_RGB888,
-       PIXFMT_YCrCbI,
+       PIXFMT_YCRCBI,
        PIXFMT_NV12,
        PIXFMT_OSD_ATTR,
 };