[media] omap3isp: fix compilation of ispvideo.c

Message ID 1321808066-1791-1-git-send-email-mad_soft@inbox.ru (mailing list archive)
State Accepted, archived
Headers

Commit Message

Dmitry Artamonow Nov. 20, 2011, 4:54 p.m. UTC
  Fix following build error by explicitely including <linux/module.h>
header file.

  CC      drivers/media/video/omap3isp/ispvideo.o
drivers/media/video/omap3isp/ispvideo.c:1267: error: 'THIS_MODULE' undeclared here (not in a function)
make[4]: *** [drivers/media/video/omap3isp/ispvideo.o] Error 1
make[3]: *** [drivers/media/video/omap3isp] Error 2
make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2

Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
---
 drivers/media/video/omap3isp/ispvideo.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
  

Comments

Laurent Pinchart Nov. 23, 2011, 1:53 a.m. UTC | #1
Hi Dmitry,

On Sunday 20 November 2011 17:54:26 Dmitry Artamonow wrote:
> Fix following build error by explicitely including <linux/module.h>
> header file.
> 
>   CC      drivers/media/video/omap3isp/ispvideo.o
> drivers/media/video/omap3isp/ispvideo.c:1267: error: 'THIS_MODULE'
> undeclared here (not in a function) make[4]: ***
> [drivers/media/video/omap3isp/ispvideo.o] Error 1
> make[3]: *** [drivers/media/video/omap3isp] Error 2
> make[2]: *** [drivers/media/video] Error 2
> make[1]: *** [drivers/media] Error 2
> make: *** [drivers] Error 2
> 
> Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Mauro, can you pick this for v3.2, or would you like me to send a pull request 
?

> ---
>  drivers/media/video/omap3isp/ispvideo.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/video/omap3isp/ispvideo.c
> b/drivers/media/video/omap3isp/ispvideo.c index d100072..f229057 100644
> --- a/drivers/media/video/omap3isp/ispvideo.c
> +++ b/drivers/media/video/omap3isp/ispvideo.c
> @@ -26,6 +26,7 @@
>  #include <asm/cacheflush.h>
>  #include <linux/clk.h>
>  #include <linux/mm.h>
> +#include <linux/module.h>
>  #include <linux/pagemap.h>
>  #include <linux/scatterlist.h>
>  #include <linux/sched.h>
  
Ohad Ben-Cohen Dec. 8, 2011, 6:31 a.m. UTC | #2
On Wed, Nov 23, 2011 at 3:53 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Sunday 20 November 2011 17:54:26 Dmitry Artamonow wrote:
>> Fix following build error by explicitely including <linux/module.h>
>> header file.
>>
>>   CC      drivers/media/video/omap3isp/ispvideo.o
>> drivers/media/video/omap3isp/ispvideo.c:1267: error: 'THIS_MODULE'
>> undeclared here (not in a function) make[4]: ***
>> [drivers/media/video/omap3isp/ispvideo.o] Error 1
>> make[3]: *** [drivers/media/video/omap3isp] Error 2
>> make[2]: *** [drivers/media/video] Error 2
>> make[1]: *** [drivers/media] Error 2
>> make: *** [drivers] Error 2
>>
>> Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> Mauro, can you pick this for v3.2, or would you like me to send a pull request
> ?

Folks, was this one picked up by anyone ?

We seem to still have this issue in mainline (at least in rc4).

Thanks,
Ohad.
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  
Laurent Pinchart Dec. 8, 2011, 9:53 a.m. UTC | #3
Hi Ohad,

On Thursday 08 December 2011 07:31:29 Ohad Ben-Cohen wrote:
> On Wed, Nov 23, 2011 at 3:53 AM, Laurent Pinchart wrote:
> > On Sunday 20 November 2011 17:54:26 Dmitry Artamonow wrote:
> >> Fix following build error by explicitely including <linux/module.h>
> >> header file.
> >> 
> >>   CC      drivers/media/video/omap3isp/ispvideo.o
> >> drivers/media/video/omap3isp/ispvideo.c:1267: error: 'THIS_MODULE'
> >> undeclared here (not in a function) make[4]: ***
> >> [drivers/media/video/omap3isp/ispvideo.o] Error 1
> >> make[3]: *** [drivers/media/video/omap3isp] Error 2
> >> make[2]: *** [drivers/media/video] Error 2
> >> make[1]: *** [drivers/media] Error 2
> >> make: *** [drivers] Error 2
> >> 
> >> Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
> > 
> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > 
> > Mauro, can you pick this for v3.2, or would you like me to send a pull
> > request ?
> 
> Folks, was this one picked up by anyone ?
> 
> We seem to still have this issue in mainline (at least in rc4).

According to http://patchwork.linuxtv.org/patch/8510/ the patch has been 
accepted. Mauro, do you have any time estimate regarding when you will push 
that to Linus ?
  

Patch

diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index d100072..f229057 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -26,6 +26,7 @@ 
 #include <asm/cacheflush.h>
 #include <linux/clk.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/pagemap.h>
 #include <linux/scatterlist.h>
 #include <linux/sched.h>