diff mbox

m5mols: Replace missing header

Message ID 1401047695-2046-1-git-send-email-laurent.pinchart@ideasonboard.com (mailing list archive)
State New, archived
Headers show

Commit Message

Laurent Pinchart May 25, 2014, 7:54 p.m. UTC
The include/media/s5p_fimc.h header has been removed in commit
49b2f4c56fbf70ca693d6df1c491f0566d516aea ("exynos4-is: Remove support
for non-dt platforms"). This broke compilation of the m5mols driver.

Include the include/media/exynos-fimc.h header instead, which contains
the S5P_FIMC_TX_END_NOTIFY definition required by the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/i2c/m5mols/m5mols_capture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(Resending to linux-media has the original patch seems not to have made it to
the list for an unknown reason.)

This is a regression in Mauro's latest master branch.

Comments

Hi Laurent,

On 25/05/14 21:54, Laurent Pinchart wrote:
> The include/media/s5p_fimc.h header has been removed in commit
> 49b2f4c56fbf70ca693d6df1c491f0566d516aea ("exynos4-is: Remove support
> for non-dt platforms"). This broke compilation of the m5mols driver.
> 
> Include the include/media/exynos-fimc.h header instead, which contains
> the S5P_FIMC_TX_END_NOTIFY definition required by the driver.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Thanks for the fix. I though about adding to this patch:

Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

But it seems the patch is already in Mauro's tree.

> ---
>  drivers/media/i2c/m5mols/m5mols_capture.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> (Resending to linux-media has the original patch seems not to have made it to
> the list for an unknown reason.)
> 
> This is a regression in Mauro's latest master branch.
> 
> diff --git a/drivers/media/i2c/m5mols/m5mols_capture.c b/drivers/media/i2c/m5mols/m5mols_capture.c
> index ab34cce..1a03d02 100644
> --- a/drivers/media/i2c/m5mols/m5mols_capture.c
> +++ b/drivers/media/i2c/m5mols/m5mols_capture.c
> @@ -26,7 +26,7 @@
>  #include <media/v4l2-device.h>
>  #include <media/v4l2-subdev.h>
>  #include <media/m5mols.h>
> -#include <media/s5p_fimc.h>
> +#include <media/exynos-fimc.h>
>  
>  #include "m5mols.h"
>  #include "m5mols_reg.h"
Laurent Pinchart May 26, 2014, 9:29 a.m. UTC | #2
Hi Sylwester,

On Monday 26 May 2014 11:04:12 Sylwester Nawrocki wrote:
> On 25/05/14 21:54, Laurent Pinchart wrote:
> > The include/media/s5p_fimc.h header has been removed in commit
> > 49b2f4c56fbf70ca693d6df1c491f0566d516aea ("exynos4-is: Remove support
> > for non-dt platforms"). This broke compilation of the m5mols driver.
> > 
> > Include the include/media/exynos-fimc.h header instead, which contains
> > the S5P_FIMC_TX_END_NOTIFY definition required by the driver.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> Thanks for the fix.

You're welcome. I just happened to run across the problem while compiling my 
tree, it didn't take long to fix it :-)

> I though about adding to this patch:
> 
> Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> 
> But it seems the patch is already in Mauro's tree.
diff mbox

Patch

diff --git a/drivers/media/i2c/m5mols/m5mols_capture.c b/drivers/media/i2c/m5mols/m5mols_capture.c
index ab34cce..1a03d02 100644
--- a/drivers/media/i2c/m5mols/m5mols_capture.c
+++ b/drivers/media/i2c/m5mols/m5mols_capture.c
@@ -26,7 +26,7 @@ 
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
 #include <media/m5mols.h>
-#include <media/s5p_fimc.h>
+#include <media/exynos-fimc.h>
 
 #include "m5mols.h"
 #include "m5mols_reg.h"