diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-11 17:55:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-11 17:55:53 -0300 |
| commit | 24bda047c0558518cdd4845894af9a62fe0cfe36 (patch) | |
| tree | c416ffdadc7f9d60dc4afa9cb280edbae12d7cfc /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | a41e94657c3e886deba4598e37284a52fc8dc310 (diff) | |
| download | mediapointer-dvb-s2-24bda047c0558518cdd4845894af9a62fe0cfe36.tar.gz mediapointer-dvb-s2-24bda047c0558518cdd4845894af9a62fe0cfe36.tar.bz2 | |
Merge: from V4L1 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -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 e17c91b4c..9c2f0dd39 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -38,7 +38,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 |