diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-11 20:11:34 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-11 20:11:34 +0000 |
| commit | 03ad0fac693b608f7a870d1b3b71f73c3429df72 (patch) | |
| tree | 23afc7ad7f94adde24532e21d0c7695d9797e784 /linux/drivers/media/video/saa7134/saa7134.h | |
| parent | 72df048713f9c8f3d39b06e3c8f6d571cc01e38e (diff) | |
| download | mediapointer-dvb-s2-03ad0fac693b608f7a870d1b3b71f73c3429df72.tar.gz mediapointer-dvb-s2-03ad0fac693b608f7a870d1b3b71f73c3429df72.tar.bz2 | |
* ../linux/drivers/media/video/cx88/cx88.h:
* ../v4l/Make.config:
* ../v4l/Makefile:
- Allow to disable build of video-buf-dvb in Make.config
using compile flag CONFIG_VIDEO_BUF_DVB
- replaced check using this method:
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+#ifdef HAVE_VIDEO_BUF_DVB
* ../linux/drivers/media/video/saa7134/saa7134.h:
- #include <linux/notifier.h> in saa7134.h to fix build
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index e50d2ab64..eb46ca890 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.62 2005/10/09 18:07:06 mchehab Exp $ + * $Id: saa7134.h,v 1.63 2005/10/11 20:11:34 mkrufky Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -28,6 +28,7 @@ #include <linux/videodev.h> #include <linux/kdev_t.h> #include <linux/input.h> +#include <linux/notifier.h> #include <asm/io.h> @@ -40,12 +41,13 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,64) #include <media/i2c-compat.h> #else -#include <media/video-buf-dvb.h> #include <sound/driver.h> #include <sound/core.h> #include <sound/pcm.h> #endif - +#ifdef HAVE_VIDEO_BUF_DVB +#include <media/video-buf-dvb.h> +#endif #ifndef TRUE # define TRUE (1==1) @@ -508,7 +510,7 @@ struct saa7134_dev { struct work_struct empress_workqueue; int empress_started; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +#ifdef HAVE_VIDEO_BUF_DVB /* SAA7134_MPEG_DVB only */ struct videobuf_dvb dvb; #endif |