aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-12-02 19:43:15 +0800
committerEric Miao <eric.miao@linaro.org>2011-12-02 20:26:34 +0800
commit4bb2077a6482e6f6e10a72d471b090be12582311 (patch)
tree7c9a87a879ed603234c54a3445a65013273431e1
parent0172b285a44698c8a5fb821033b51ca97314b0ba (diff)
downloadlinux-linaro-lt-3.2.tar.gz
SAUCE: fix building error of mxc_v4l2_output.clt-3.2
CC [M] drivers/media/video/mxc/output/mxc_v4l2_output.o linux-linaro/drivers/media/video/mxc/output/mxc_v4l2_output.c:203:12: error: static declaration of ‘fmt_to_bpp’ follows non-static declaration linux-linaro/include/linux/ipu.h:257:14: note: previous declaration of ‘fmt_to_bpp’ was here make[5]: *** [drivers/media/video/mxc/output/mxc_v4l2_output.o] Error 1 make[4]: *** [drivers/media/video/mxc/output] Error 2 make[3]: *** [drivers/media/video] Error 2 make[2]: *** [drivers/media] Error 2 make[1]: *** [drivers] Error 2 make: *** [sub-make] Error 2 Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--drivers/media/video/mxc/output/mxc_v4l2_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/output/mxc_v4l2_output.c b/drivers/media/video/mxc/output/mxc_v4l2_output.c
index 49e538e8c46..3710ae8e9b0 100644
--- a/drivers/media/video/mxc/output/mxc_v4l2_output.c
+++ b/drivers/media/video/mxc/output/mxc_v4l2_output.c
@@ -200,7 +200,7 @@ static int mxc_allocate_buffers(dma_addr_t bufs_paddr[], void *bufs_vaddr[],
*
* @return bits per pixel of pixelformat
*/
-static u32 fmt_to_bpp(u32 pixelformat)
+unsigned int fmt_to_bpp(u32 pixelformat)
{
u32 bpp;