diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:10:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:10:32 -0300 |
| commit | 1cbfa6bb381bc427843d530820fb666d0ed9a310 (patch) | |
| tree | f74da7f181ead203e12e151a1a60f7eb5816dc3c /v4l_experimental | |
| parent | 29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79 (diff) | |
| parent | aa74e8c588686e857f1817a82211865bf3cc28e4 (diff) | |
| download | mediapointer-dvb-s2-1cbfa6bb381bc427843d530820fb666d0ed9a310.tar.gz mediapointer-dvb-s2-1cbfa6bb381bc427843d530820fb666d0ed9a310.tar.bz2 | |
Merge from mkrufky's cx88-ivtv tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l_experimental')
| -rw-r--r-- | v4l_experimental/cx88-ivtv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/v4l_experimental/cx88-ivtv.c b/v4l_experimental/cx88-ivtv.c index c28c1d413..a747e2372 100644 --- a/v4l_experimental/cx88-ivtv.c +++ b/v4l_experimental/cx88-ivtv.c @@ -25,8 +25,8 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> - #include "compat.h" +#include <media/v4l2-common.h> #include "cx88.h" MODULE_DESCRIPTION("ivtv ioctl emulation module for blackbird TV cards"); @@ -111,10 +111,10 @@ static int ivtv_do_ioctl(struct inode *inode, struct file *file, /* int err; */ if (debug > 1) - cx88_print_ioctl(dev->core->name,cmd); + v4l_print_ioctl(dev->core->name,cmd); #if 1 printk( KERN_INFO "IVTV IOCTL: 0x%x\n", cmd ); - cx88_print_ioctl(dev->core->name,cmd); + v4l_print_ioctl(dev->core->name,cmd); #endif dprintk( 1, "IVTV IOCTL: 0x%x\n", cmd ); |