diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-09 19:17:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-09 19:17:19 -0300 |
| commit | 88d2f64be52dc30021041fe19e19f59c39549330 (patch) | |
| tree | 4a36a803fb304826a7136a2ae56af14e6834227c /linux/drivers/media/video/cx88 | |
| parent | 6f35eb920300b903a0078d2ca191d1ea9cd7a15f (diff) | |
| parent | 9c3c5a718fce00294e192f6d722db93fd60e0006 (diff) | |
| download | mediapointer-dvb-s2-88d2f64be52dc30021041fe19e19f59c39549330.tar.gz mediapointer-dvb-s2-88d2f64be52dc30021041fe19e19f59c39549330.tar.bz2 | |
Merging from master:
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 1bcd20d23..095b4b1cd 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -39,7 +39,7 @@ #include "cx88.h" #include <media/v4l2-common.h> -#if 1 +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* Include V4L1 specific functions. Should be removed soon */ #include <linux/videodev.h> #endif |