diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:58:50 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:58:50 -0300 |
commit | b08432f588a4161f12dd8419a2673ba582c9d3ab (patch) | |
tree | 4ec2fd257cac5434cf2d3cda154f65d77e5006f1 /linux/drivers/media/video/usbvision | |
parent | 424e8229ba171eb97b4d366990e3dd17b1eade74 (diff) | |
parent | ff3f4061e1e6854e0d2c8c52c2363f3d67302651 (diff) | |
download | mediapointer-dvb-s2-b08432f588a4161f12dd8419a2673ba582c9d3ab.tar.gz mediapointer-dvb-s2-b08432f588a4161f12dd8419a2673ba582c9d3ab.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/pending
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvision')
4 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-cards.c b/linux/drivers/media/video/usbvision/usbvision-cards.c index ecb10b296..42e47cc3d 100644 --- a/linux/drivers/media/video/usbvision/usbvision-cards.c +++ b/linux/drivers/media/video/usbvision/usbvision-cards.c @@ -24,7 +24,6 @@ #include <linux/list.h> -#include "compat.h" #include <media/v4l2-dev.h> #include <media/tuner.h> #include "usbvision.h" diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c index a6afa78bf..8125f3116 100644 --- a/linux/drivers/media/video/usbvision/usbvision-core.c +++ b/linux/drivers/media/video/usbvision/usbvision-core.c @@ -29,7 +29,6 @@ #include <linux/slab.h> #include <linux/mm.h> #include <linux/utsname.h> -#include "compat.h" #include <linux/highmem.h> #include <linux/videodev.h> #include <linux/vmalloc.h> diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index 41b3a0d42..6c502e1fb 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -52,7 +52,6 @@ #include <linux/slab.h> #include <linux/mm.h> #include <linux/utsname.h> -#include "compat.h" #include <linux/highmem.h> #include <linux/videodev.h> #include <linux/vmalloc.h> diff --git a/linux/drivers/media/video/usbvision/usbvision.h b/linux/drivers/media/video/usbvision/usbvision.h index 31964faed..aa0967540 100644 --- a/linux/drivers/media/video/usbvision/usbvision.h +++ b/linux/drivers/media/video/usbvision/usbvision.h @@ -37,6 +37,7 @@ #include <media/v4l2-common.h> #include <media/tuner.h> #include <linux/videodev2.h> +#include "compat.h" #define USBVISION_DEBUG /* Turn on debug messages */ |