diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-02 17:52:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-02 17:54:07 -0300 |
| commit | 1fc78bc9d4cd9714b995f61ef414645c0d54a0bb (patch) | |
| tree | 8b4c4d6089fb5be81b1a933784f168e04f9b329c /drivers/media/platform/vivid/vivid-vid-common.h | |
| parent | 6de8653f410c5413a557eb48e2492a93f7af664b (diff) | |
[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-common.h')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-vid-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-common.h b/drivers/media/platform/vivid/vivid-vid-common.h index 9563c327fe56..3ec4fa85c9b9 100644 --- a/drivers/media/platform/vivid/vivid-vid-common.h +++ b/drivers/media/platform/vivid/vivid-vid-common.h @@ -32,7 +32,7 @@ int fmt_sp2mp_func(struct file *file, void *priv, extern const struct v4l2_dv_timings_cap vivid_dv_timings_cap; -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); bool vivid_vid_can_loop(struct vivid_dev *dev); void vivid_send_source_change(struct vivid_dev *dev, unsigned type); |