From 1fc78bc9d4cd9714b995f61ef414645c0d54a0bb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 2 Sep 2014 17:52:07 -0300 Subject: [media] vivid: Don't mess with namespace adding a "get_format" function This fixes a compilation error with allyesconfig: drivers/media/platform/exynos-gsc/built-in.o: In function `get_format': (.text+0x12f5): multiple definition of `get_format' drivers/media/platform/vivid/built-in.o:(.text+0x4bf4): first defined here Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/vivid/vivid-vid-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/media/platform/vivid/vivid-vid-common.c') diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/platform/vivid/vivid-vid-common.c index 7b981c1..16cd6d2 100644 --- a/drivers/media/platform/vivid/vivid-vid-common.c +++ b/drivers/media/platform/vivid/vivid-vid-common.c @@ -186,7 +186,7 @@ struct vivid_fmt vivid_formats[] = { /* There are 2 multiplanar formats in the list */ #define VIVID_MPLANAR_FORMATS 2 -const struct vivid_fmt *get_format(struct vivid_dev *dev, u32 pixelformat) +const struct vivid_fmt *vivid_get_format(struct vivid_dev *dev, u32 pixelformat) { const struct vivid_fmt *fmt; unsigned k; -- cgit v1.1