diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
| commit | 68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch) | |
| tree | 5fb2d14340332062e416246c5759adcaa64a2340 /drivers/media/video/exynos | |
| parent | 17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff) | |
| parent | b99374450c03bf5081b88995d91d34fb9b2fd040 (diff) | |
| download | kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2 | |
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'drivers/media/video/exynos')
| -rw-r--r-- | drivers/media/video/exynos/fimc-lite/fimc-lite-core.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/exynos/fimc-lite/fimc-lite-core.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c b/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c index 011787c..0a10f2e 100644 --- a/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c +++ b/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c @@ -122,7 +122,7 @@ static struct flite_fmt *find_format(u32 *pixelformat, u32 *mbus_code, int index } #endif -inline struct flite_fmt const *find_flite_format(struct v4l2_mbus_framefmt *mf) +struct flite_fmt const *find_flite_format(struct v4l2_mbus_framefmt *mf) { int num_fmt = ARRAY_SIZE(flite_formats); diff --git a/drivers/media/video/exynos/fimc-lite/fimc-lite-core.h b/drivers/media/video/exynos/fimc-lite/fimc-lite-core.h index 2c46c8b..a8a0a2e 100644 --- a/drivers/media/video/exynos/fimc-lite/fimc-lite-core.h +++ b/drivers/media/video/exynos/fimc-lite/fimc-lite-core.h @@ -295,7 +295,7 @@ static inline void user_to_drv(struct v4l2_ctrl *ctrl, s32 value) ctrl->cur.val = ctrl->val = value; } -inline struct flite_fmt const *find_flite_format(struct v4l2_mbus_framefmt *mf); +struct flite_fmt const *find_flite_format(struct v4l2_mbus_framefmt *mf); /* * Add buf to the capture active buffers queue. |