diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-03 00:52:07 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-03 00:54:07 +0400 |
| commit | 1fc78bc9d4cd9714b995f61ef414645c0d54a0bb (patch) | |
| tree | 8b4c4d6089fb5be81b1a933784f168e04f9b329c /drivers/media/platform/vivid/vivid-vid-out.c | |
| parent | 6de8653f410c5413a557eb48e2492a93f7af664b (diff) | |
| download | linux-1fc78bc9d4cd9714b995f61ef414645c0d54a0bb.tar.xz | |
[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 <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-vid-out.c')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-vid-out.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index 3078bd2fdc01..9fd803592864 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -340,12 +340,12 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv, unsigned w, h; unsigned p; - fmt = get_format(dev, mp->pixelformat); + fmt = vivid_get_format(dev, mp->pixelformat); if (!fmt) { dprintk(dev, 1, "Fourcc format (0x%08x) unknown.\n", mp->pixelformat); mp->pixelformat = V4L2_PIX_FMT_YUYV; - fmt = get_format(dev, mp->pixelformat); + fmt = vivid_get_format(dev, mp->pixelformat); } mp->field = vivid_field_out(dev, mp->field); @@ -440,7 +440,7 @@ int vivid_s_fmt_vid_out(struct file *file, void *priv, if (vb2_is_busy(q)) goto set_colorspace; - dev->fmt_out = get_format(dev, mp->pixelformat); + dev->fmt_out = vivid_get_format(dev, mp->pixelformat); if (V4L2_FIELD_HAS_T_OR_B(mp->field)) factor = 2; |