summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/cx88/cx88-core.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88.h4
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-core.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-i2c.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx.h1
-rw-r--r--linux/drivers/usb/media/em2820-core.c2
-rw-r--r--linux/drivers/usb/media/em2820-i2c.c2
-rw-r--r--linux/drivers/usb/media/em2820-video.c2
-rw-r--r--linux/drivers/usb/media/em2820.h1
10 files changed, 6 insertions, 16 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index 669a457af..72cbf9d6b 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-core.c,v 1.42 2005/09/11 04:58:14 mkrufky Exp $
+ * $Id: cx88-core.c,v 1.43 2005/10/09 03:35:25 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* driver core
@@ -33,7 +33,7 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include "compat.h"
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include "cx88.h"
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 5036f62cb..757614cbf 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
/*
- * $Id: cx88.h,v 1.82 2005/10/05 04:19:55 mkrufky Exp $
+ * $Id: cx88.h,v 1.83 2005/10/09 03:35:25 mchehab Exp $
*
* v4l2 device driver for cx2388x based TV cards
*
@@ -23,7 +23,7 @@
#include <linux/pci.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include <linux/kdev_t.h>
#include <media/tuner.h>
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index b7beacf23..4bc4b4c6c 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c
@@ -28,8 +28,6 @@
#include <linux/moduleparam.h>
#include <linux/usb.h>
#include <linux/vmalloc.h>
-#include "compat.h"
-#include <linux/videodev.h>
#include "em2820.h"
diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c
index e1506d92b..ae794bdee 100644
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c
@@ -26,8 +26,6 @@
#include <linux/kernel.h>
#include <linux/usb.h>
#include <linux/i2c.h>
-#include "compat.h"
-#include <linux/videodev.h>
#include <media/tuner.h>
#include <linux/video_decoder.h>
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 18a8b0039..eddabdd00 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -28,8 +28,6 @@
#include <linux/kernel.h>
#include <linux/usb.h>
#include <linux/i2c.h>
-#include "compat.h"
-#include <linux/videodev.h>
#include <media/tuner.h>
#include <linux/video_decoder.h>
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index 7ea43f6cb..b60ef31f1 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -25,6 +25,7 @@
#ifndef _EM2820_H
#define _EM2820_H
+#include "compat.h"
#include <linux/videodev.h>
#include <linux/i2c.h>
diff --git a/linux/drivers/usb/media/em2820-core.c b/linux/drivers/usb/media/em2820-core.c
index b7beacf23..4bc4b4c6c 100644
--- a/linux/drivers/usb/media/em2820-core.c
+++ b/linux/drivers/usb/media/em2820-core.c
@@ -28,8 +28,6 @@
#include <linux/moduleparam.h>
#include <linux/usb.h>
#include <linux/vmalloc.h>
-#include "compat.h"
-#include <linux/videodev.h>
#include "em2820.h"
diff --git a/linux/drivers/usb/media/em2820-i2c.c b/linux/drivers/usb/media/em2820-i2c.c
index e1506d92b..ae794bdee 100644
--- a/linux/drivers/usb/media/em2820-i2c.c
+++ b/linux/drivers/usb/media/em2820-i2c.c
@@ -26,8 +26,6 @@
#include <linux/kernel.h>
#include <linux/usb.h>
#include <linux/i2c.h>
-#include "compat.h"
-#include <linux/videodev.h>
#include <media/tuner.h>
#include <linux/video_decoder.h>
diff --git a/linux/drivers/usb/media/em2820-video.c b/linux/drivers/usb/media/em2820-video.c
index 18a8b0039..eddabdd00 100644
--- a/linux/drivers/usb/media/em2820-video.c
+++ b/linux/drivers/usb/media/em2820-video.c
@@ -28,8 +28,6 @@
#include <linux/kernel.h>
#include <linux/usb.h>
#include <linux/i2c.h>
-#include "compat.h"
-#include <linux/videodev.h>
#include <media/tuner.h>
#include <linux/video_decoder.h>
diff --git a/linux/drivers/usb/media/em2820.h b/linux/drivers/usb/media/em2820.h
index 7ea43f6cb..b60ef31f1 100644
--- a/linux/drivers/usb/media/em2820.h
+++ b/linux/drivers/usb/media/em2820.h
@@ -25,6 +25,7 @@
#ifndef _EM2820_H
#define _EM2820_H
+#include "compat.h"
#include <linux/videodev.h>
#include <linux/i2c.h>