[linux-dvb] VID_HARDWARE_SAA7146 undelcared against 2.6.15-rc1

[Michael Krufky]

C.Y.M wrote:

>When I attempt to build cvs against 2.6.15-rc1, I get the following error:
>
>--SNIP--
>
>drivers/media/common/saa7146_fops.c:438: error: `VID_HARDWARE_SAA7146'
>undeclared here (not in a function)
>drivers/media/common/saa7146_fops.c:438: error: initializer element is not constant
>drivers/media/common/saa7146_fops.c:438: error: (near initialization for
>`device_template.hardware')
>
>--SNIP--
>
>Is there a solution?
>
>Best Regards,
>  
>
Does this fix it for you?

diff -puN include/media/saa7146_vv.h~v4l-897-saa7146-fix include/media/saa7146_vv.h
--- 25/include/media/saa7146_vv.h~v4l-897-saa7146-fix	Fri Nov  4 16:23:22 2005
+++ 25-akpm/include/media/saa7146_vv.h	Fri Nov  4 16:23:22 2005
@@ -1,7 +1,7 @@
 #ifndef __SAA7146_VV__
 #define __SAA7146_VV__
 
-#include <linux/videodev2.h>
+#include <linux/videodev.h>
 
 #include <media/saa7146.h>
 #include <media/video-buf.h>


I am dealing with backwards compatability stuff right now, and there are some upstream patches from 2.6.15 that haven't yet been applied to cvs.  I think this might be all you need to fix it.  Please, let me know.

Cheers,

Michael Krufky