diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-16 20:37:51 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-16 20:37:51 -0500 |
| commit | d30a31decd05aa55764418cce0b9cce695885439 (patch) | |
| tree | 8fffef97b8b6d19639ed547eb7d6253b0f336e48 /v4l_experimental/cx88-ivtv.c | |
| parent | e0449a4964c2aec77cf02c33d2a9375b647530ce (diff) | |
| parent | 32027c8007a8b9e82f70f5eb52387db827ff8b2d (diff) | |
| download | mediapointer-dvb-s2-d30a31decd05aa55764418cce0b9cce695885439.tar.gz mediapointer-dvb-s2-d30a31decd05aa55764418cce0b9cce695885439.tar.bz2 | |
merged ~mkrufky/pending
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'v4l_experimental/cx88-ivtv.c')
| -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 ); |