Merge branch 'topic/vmaster-update' into topic/docbook-fix

[~andy/linux] / drivers / video / c2p.h

diff --git a/drivers/video/c2p.h b/drivers/video/c2p.h
index 53641298b92435e09f1c767774fd2c020af7ee27..6c38d40427d8d8da12cc084705fb76f80a652b8d 100644 (file)
--- a/drivers/video/c2p.h
+++ b/drivers/video/c2p.h
@@ -10,9 +10,9 @@
 
 #include <linux/types.h>
 
-extern void c2p(void *dst, const void *src, u32 dx, u32 dy, u32 width,
-               u32 height, u32 dst_nextline, u32 dst_nextplane,
-               u32 src_nextline, u32 bpp);
+extern void c2p_planar(void *dst, const void *src, u32 dx, u32 dy, u32 width,
+                      u32 height, u32 dst_nextline, u32 dst_nextplane,
+                      u32 src_nextline, u32 bpp);
 
 extern void c2p_iplan2(void *dst, const void *src, u32 dx, u32 dy, u32 width,
                       u32 height, u32 dst_nextline, u32 src_nextline,