aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-07-02 14:39:57 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:24:35 -0400
commit18f3fa1e2eab297a2f7ec704385fa0ecfda0de55 (patch)
tree0b163e743fc7c2c41df99956c3c45883bccde57f /drivers
parent7e520d09f1a4b3da1d09a4540e3f4fa852658a0d (diff)
V4L/DVB (5819): Cleanup: reorder some includes
Some includes were added after some non-include macros, on old drivers. Better to keep all includes at the beginning of the files. This change also helps to make backports to properly work at the development tree. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/adv7170.c8
-rw-r--r--drivers/media/video/adv7175.c8
-rw-r--r--drivers/media/video/bt819.c9
-rw-r--r--drivers/media/video/bt856.c8
-rw-r--r--drivers/media/video/bt8xx/bttvp.h2
-rw-r--r--drivers/media/video/saa7111.c8
-rw-r--r--drivers/media/video/saa7114.c10
-rw-r--r--drivers/media/video/saa7185.c8
8 files changed, 30 insertions, 31 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 823cd6cc471e..cbab53fc6243 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -38,23 +38,23 @@
38#include <linux/slab.h> 38#include <linux/slab.h>
39#include <linux/mm.h> 39#include <linux/mm.h>
40#include <linux/signal.h> 40#include <linux/signal.h>
41#include <linux/types.h>
42#include <linux/i2c.h>
41#include <asm/io.h> 43#include <asm/io.h>
42#include <asm/pgtable.h> 44#include <asm/pgtable.h>
43#include <asm/page.h> 45#include <asm/page.h>
44#include <linux/types.h> 46#include <asm/uaccess.h>
45 47
46#include <linux/videodev.h> 48#include <linux/videodev.h>
47#include <asm/uaccess.h> 49#include <linux/video_encoder.h>
48 50
49MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver"); 51MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");
50MODULE_AUTHOR("Maxim Yevtyushkin"); 52MODULE_AUTHOR("Maxim Yevtyushkin");
51MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
52 54
53#include <linux/i2c.h>
54 55
55#define I2C_NAME(x) (x)->name 56#define I2C_NAME(x) (x)->name
56 57
57#include <linux/video_encoder.h>
58 58
59static int debug = 0; 59static int debug = 0;
60module_param(debug, int, 0); 60module_param(debug, int, 0);
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 05c7820fe53e..0d0c554bfdf7 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -34,23 +34,23 @@
34#include <linux/slab.h> 34#include <linux/slab.h>
35#include <linux/mm.h> 35#include <linux/mm.h>
36#include <linux/signal.h> 36#include <linux/signal.h>
37#include <linux/types.h>
38#include <linux/i2c.h>
37#include <asm/io.h> 39#include <asm/io.h>
38#include <asm/pgtable.h> 40#include <asm/pgtable.h>
39#include <asm/page.h> 41#include <asm/page.h>
40#include <linux/types.h> 42#include <asm/uaccess.h>
41 43
42#include <linux/videodev.h> 44#include <linux/videodev.h>
43#include <asm/uaccess.h> 45#include <linux/video_encoder.h>
44 46
45MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver"); 47MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");
46MODULE_AUTHOR("Dave Perks"); 48MODULE_AUTHOR("Dave Perks");
47MODULE_LICENSE("GPL"); 49MODULE_LICENSE("GPL");
48 50
49#include <linux/i2c.h>
50 51
51#define I2C_NAME(s) (s)->name 52#define I2C_NAME(s) (s)->name
52 53
53#include <linux/video_encoder.h>
54 54
55static int debug = 0; 55static int debug = 0;
56module_param(debug, int, 0); 56module_param(debug, int, 0);
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 59a43603b5cb..12d1b9248be5 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -38,23 +38,24 @@
38#include <linux/slab.h> 38#include <linux/slab.h>
39#include <linux/mm.h> 39#include <linux/mm.h>
40#include <linux/signal.h> 40#include <linux/signal.h>
41#include <linux/types.h>
42#include <linux/i2c.h>
41#include <asm/io.h> 43#include <asm/io.h>
42#include <asm/pgtable.h> 44#include <asm/pgtable.h>
43#include <asm/page.h> 45#include <asm/page.h>
44#include <linux/types.h> 46#include <asm/uaccess.h>
45 47
46#include <linux/videodev.h> 48#include <linux/videodev.h>
47#include <asm/uaccess.h> 49#include <linux/video_decoder.h>
50
48 51
49MODULE_DESCRIPTION("Brooktree-819 video decoder driver"); 52MODULE_DESCRIPTION("Brooktree-819 video decoder driver");
50MODULE_AUTHOR("Mike Bernson & Dave Perks"); 53MODULE_AUTHOR("Mike Bernson & Dave Perks");
51MODULE_LICENSE("GPL"); 54MODULE_LICENSE("GPL");
52 55
53#include <linux/i2c.h>
54 56
55#define I2C_NAME(s) (s)->name 57#define I2C_NAME(s) (s)->name
56 58
57#include <linux/video_decoder.h>
58 59
59static int debug = 0; 60static int debug = 0;
60module_param(debug, int, 0); 61module_param(debug, int, 0);
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 853b1a3d6a1d..e1028a76c042 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -38,23 +38,23 @@
38#include <linux/slab.h> 38#include <linux/slab.h>
39#include <linux/mm.h> 39#include <linux/mm.h>
40#include <linux/signal.h> 40#include <linux/signal.h>
41#include <linux/types.h>
42#include <linux/i2c.h>
43#include <linux/video_encoder.h>
41#include <asm/io.h> 44#include <asm/io.h>
42#include <asm/pgtable.h> 45#include <asm/pgtable.h>
43#include <asm/page.h> 46#include <asm/page.h>
44#include <linux/types.h> 47#include <asm/uaccess.h>
45 48
46#include <linux/videodev.h> 49#include <linux/videodev.h>
47#include <asm/uaccess.h>
48 50
49MODULE_DESCRIPTION("Brooktree-856A video encoder driver"); 51MODULE_DESCRIPTION("Brooktree-856A video encoder driver");
50MODULE_AUTHOR("Mike Bernson & Dave Perks"); 52MODULE_AUTHOR("Mike Bernson & Dave Perks");
51MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
52 54
53#include <linux/i2c.h>
54 55
55#define I2C_NAME(s) (s)->name 56#define I2C_NAME(s) (s)->name
56 57
57#include <linux/video_encoder.h>
58 58
59static int debug = 0; 59static int debug = 0;
60module_param(debug, int, 0); 60module_param(debug, int, 0);
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 8f44f02029be..bd85f6d0fbe3 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -33,12 +33,12 @@
33#include <linux/i2c.h> 33#include <linux/i2c.h>
34#include <linux/i2c-algo-bit.h> 34#include <linux/i2c-algo-bit.h>
35#include <linux/videodev.h> 35#include <linux/videodev.h>
36#include <media/v4l2-common.h>
37#include <linux/pci.h> 36#include <linux/pci.h>
38#include <linux/input.h> 37#include <linux/input.h>
39#include <linux/mutex.h> 38#include <linux/mutex.h>
40#include <asm/scatterlist.h> 39#include <asm/scatterlist.h>
41#include <asm/io.h> 40#include <asm/io.h>
41#include <media/v4l2-common.h>
42 42
43#include <linux/device.h> 43#include <linux/device.h>
44#include <media/video-buf.h> 44#include <media/video-buf.h>
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index c1a392e47170..7ae2d646d000 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -37,23 +37,23 @@
37#include <linux/slab.h> 37#include <linux/slab.h>
38#include <linux/mm.h> 38#include <linux/mm.h>
39#include <linux/signal.h> 39#include <linux/signal.h>
40#include <linux/types.h>
41#include <linux/i2c.h>
40#include <asm/io.h> 42#include <asm/io.h>
41#include <asm/pgtable.h> 43#include <asm/pgtable.h>
42#include <asm/page.h> 44#include <asm/page.h>
43#include <linux/types.h> 45#include <asm/uaccess.h>
44 46
45#include <linux/videodev.h> 47#include <linux/videodev.h>
46#include <asm/uaccess.h> 48#include <linux/video_decoder.h>
47 49
48MODULE_DESCRIPTION("Philips SAA7111 video decoder driver"); 50MODULE_DESCRIPTION("Philips SAA7111 video decoder driver");
49MODULE_AUTHOR("Dave Perks"); 51MODULE_AUTHOR("Dave Perks");
50MODULE_LICENSE("GPL"); 52MODULE_LICENSE("GPL");
51 53
52#include <linux/i2c.h>
53 54
54#define I2C_NAME(s) (s)->name 55#define I2C_NAME(s) (s)->name
55 56
56#include <linux/video_decoder.h>
57 57
58static int debug = 0; 58static int debug = 0;
59module_param(debug, int, 0644); 59module_param(debug, int, 0644);
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 87c3144ec7fc..677df51de1a9 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -35,28 +35,26 @@
35#include <linux/fs.h> 35#include <linux/fs.h>
36#include <linux/kernel.h> 36#include <linux/kernel.h>
37#include <linux/major.h> 37#include <linux/major.h>
38
39#include <linux/slab.h> 38#include <linux/slab.h>
40
41#include <linux/mm.h> 39#include <linux/mm.h>
42#include <linux/signal.h> 40#include <linux/signal.h>
41#include <linux/types.h>
42#include <linux/i2c.h>
43#include <asm/io.h> 43#include <asm/io.h>
44#include <asm/pgtable.h> 44#include <asm/pgtable.h>
45#include <asm/page.h> 45#include <asm/page.h>
46#include <linux/types.h> 46#include <asm/uaccess.h>
47 47
48#include <linux/videodev.h> 48#include <linux/videodev.h>
49#include <asm/uaccess.h> 49#include <linux/video_decoder.h>
50 50
51MODULE_DESCRIPTION("Philips SAA7114H video decoder driver"); 51MODULE_DESCRIPTION("Philips SAA7114H video decoder driver");
52MODULE_AUTHOR("Maxim Yevtyushkin"); 52MODULE_AUTHOR("Maxim Yevtyushkin");
53MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
54 54
55#include <linux/i2c.h>
56 55
57#define I2C_NAME(x) (x)->name 56#define I2C_NAME(x) (x)->name
58 57
59#include <linux/video_decoder.h>
60 58
61static int debug = 0; 59static int debug = 0;
62module_param(debug, int, 0); 60module_param(debug, int, 0);
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 339592e7722d..66cc92c0ea66 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -34,23 +34,23 @@
34#include <linux/slab.h> 34#include <linux/slab.h>
35#include <linux/mm.h> 35#include <linux/mm.h>
36#include <linux/signal.h> 36#include <linux/signal.h>
37#include <linux/types.h>
38#include <linux/i2c.h>
37#include <asm/io.h> 39#include <asm/io.h>
38#include <asm/pgtable.h> 40#include <asm/pgtable.h>
39#include <asm/page.h> 41#include <asm/page.h>
40#include <linux/types.h> 42#include <asm/uaccess.h>
41 43
42#include <linux/videodev.h> 44#include <linux/videodev.h>
43#include <asm/uaccess.h> 45#include <linux/video_encoder.h>
44 46
45MODULE_DESCRIPTION("Philips SAA7185 video encoder driver"); 47MODULE_DESCRIPTION("Philips SAA7185 video encoder driver");
46MODULE_AUTHOR("Dave Perks"); 48MODULE_AUTHOR("Dave Perks");
47MODULE_LICENSE("GPL"); 49MODULE_LICENSE("GPL");
48 50
49#include <linux/i2c.h>
50 51
51#define I2C_NAME(s) (s)->name 52#define I2C_NAME(s) (s)->name
52 53
53#include <linux/video_encoder.h>
54 54
55static int debug = 0; 55static int debug = 0;
56module_param(debug, int, 0); 56module_param(debug, int, 0);
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-06 05:29:20 -0400