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/pvrusb2/pvrusb2-main.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/pvrusb2/pvrusb2-main.c')
-rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c index 40fb6ae41..988f32ad4 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c @@ -29,7 +29,7 @@ #include <linux/moduleparam.h> #include <linux/smp_lock.h> #include <linux/usb.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include "pvrusb2-hdw.h" #include "pvrusb2-context.h" |