aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/adv7170.c1
-rw-r--r--drivers/media/video/adv7175.c1
-rw-r--r--drivers/media/video/bt819.c1
-rw-r--r--drivers/media/video/bt856.c1
-rw-r--r--drivers/media/video/saa7110.c1
-rw-r--r--drivers/media/video/saa7111.c1
-rw-r--r--drivers/media/video/saa7114.c1
-rw-r--r--drivers/media/video/saa711x.c1
-rw-r--r--drivers/media/video/saa7185.c1
-rw-r--r--drivers/media/video/vpx3220.c1
-rw-r--r--sound/oss/dmasound/dmasound_awacs.c2
-rw-r--r--sound/ppc/daca.c1
-rw-r--r--sound/ppc/keywest.c1
-rw-r--r--sound/ppc/toonie.c1
-rw-r--r--sound/ppc/tumbler.c1
15 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 4ce07ae62da..6e2004cdec1 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -53,7 +53,6 @@ MODULE_AUTHOR("Maxim Yevtyushkin");
53MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
54 54
55#include <linux/i2c.h> 55#include <linux/i2c.h>
56#include <linux/i2c-dev.h>
57 56
58#define I2C_NAME(x) (x)->name 57#define I2C_NAME(x) (x)->name
59 58
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 4e218f22b21..6b17247adf8 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -49,7 +49,6 @@ MODULE_AUTHOR("Dave Perks");
49MODULE_LICENSE("GPL"); 49MODULE_LICENSE("GPL");
50 50
51#include <linux/i2c.h> 51#include <linux/i2c.h>
52#include <linux/i2c-dev.h>
53 52
54#define I2C_NAME(s) (s)->name 53#define I2C_NAME(s) (s)->name
55 54
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index d6447791d0e..2bf63e7ab4e 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -53,7 +53,6 @@ MODULE_AUTHOR("Mike Bernson & Dave Perks");
53MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
54 54
55#include <linux/i2c.h> 55#include <linux/i2c.h>
56#include <linux/i2c-dev.h>
57 56
58#define I2C_NAME(s) (s)->name 57#define I2C_NAME(s) (s)->name
59 58
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 909b593530e..da3be00ae2f 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -53,7 +53,6 @@ MODULE_AUTHOR("Mike Bernson & Dave Perks");
53MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
54 54
55#include <linux/i2c.h> 55#include <linux/i2c.h>
56#include <linux/i2c-dev.h>
57 56
58#define I2C_NAME(s) (s)->name 57#define I2C_NAME(s) (s)->name
59 58
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 7bb85a7b326..dff06895171 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -39,7 +39,6 @@ MODULE_AUTHOR("Pauline Middelink");
39MODULE_LICENSE("GPL"); 39MODULE_LICENSE("GPL");
40 40
41#include <linux/i2c.h> 41#include <linux/i2c.h>
42#include <linux/i2c-dev.h>
43 42
44#define I2C_NAME(s) (s)->name 43#define I2C_NAME(s) (s)->name
45 44
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 8c06592b37f..5e06cc98442 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -52,7 +52,6 @@ MODULE_AUTHOR("Dave Perks");
52MODULE_LICENSE("GPL"); 52MODULE_LICENSE("GPL");
53 53
54#include <linux/i2c.h> 54#include <linux/i2c.h>
55#include <linux/i2c-dev.h>
56 55
57#define I2C_NAME(s) (s)->name 56#define I2C_NAME(s) (s)->name
58 57
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index fd0a4b4ef01..ce5a740e923 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -55,7 +55,6 @@ MODULE_AUTHOR("Maxim Yevtyushkin");
55MODULE_LICENSE("GPL"); 55MODULE_LICENSE("GPL");
56 56
57#include <linux/i2c.h> 57#include <linux/i2c.h>
58#include <linux/i2c-dev.h>
59 58
60#define I2C_NAME(x) (x)->name 59#define I2C_NAME(x) (x)->name
61 60
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 6c161f2f5e2..708fae51e8e 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -45,7 +45,6 @@ MODULE_AUTHOR("Dave Perks, Jose Ignacio Gijon, Joerg Heckenbach, Mark McClelland
45MODULE_LICENSE("GPL"); 45MODULE_LICENSE("GPL");
46 46
47#include <linux/i2c.h> 47#include <linux/i2c.h>
48#include <linux/i2c-dev.h>
49 48
50#define I2C_NAME(s) (s)->name 49#define I2C_NAME(s) (s)->name
51 50
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 3ed0edb870a..e1718e85f6c 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -49,7 +49,6 @@ MODULE_AUTHOR("Dave Perks");
49MODULE_LICENSE("GPL"); 49MODULE_LICENSE("GPL");
50 50
51#include <linux/i2c.h> 51#include <linux/i2c.h>
52#include <linux/i2c-dev.h>
53 52
54#define I2C_NAME(s) (s)->name 53#define I2C_NAME(s) (s)->name
55 54
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index d0a1e72ea8c..4cd57996748 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -30,7 +30,6 @@
30#include <asm/uaccess.h> 30#include <asm/uaccess.h>
31 31
32#include <linux/i2c.h> 32#include <linux/i2c.h>
33#include <linux/i2c-dev.h>
34 33
35#define I2C_NAME(x) (x)->name 34#define I2C_NAME(x) (x)->name
36 35
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index a17375141c3..6ba8d6f45fe 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -88,8 +88,6 @@
88#include <linux/pmu.h> 88#include <linux/pmu.h>
89#endif 89#endif
90 90
91#include <linux/i2c-dev.h>
92
93#include <asm/uaccess.h> 91#include <asm/uaccess.h>
94#include <asm/prom.h> 92#include <asm/prom.h>
95#include <asm/machdep.h> 93#include <asm/machdep.h>
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index 08cde51177d..aa09ebd9ffb 100644
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -22,7 +22,6 @@
22#include <sound/driver.h> 22#include <sound/driver.h>
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/i2c.h> 24#include <linux/i2c.h>
25#include <linux/i2c-dev.h>
26#include <linux/kmod.h> 25#include <linux/kmod.h>
27#include <linux/slab.h> 26#include <linux/slab.h>
28#include <sound/core.h> 27#include <sound/core.h>
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 6058c2dd1b7..fb05938dcbd 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -23,7 +23,6 @@
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/i2c.h> 24#include <linux/i2c.h>
25#include <linux/delay.h> 25#include <linux/delay.h>
26#include <linux/i2c-dev.h>
27#include <linux/slab.h> 26#include <linux/slab.h>
28#include <sound/core.h> 27#include <sound/core.h>
29#include "pmac.h" 28#include "pmac.h"
diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c
index 053b8f24e4d..210be20dc27 100644
--- a/sound/ppc/toonie.c
+++ b/sound/ppc/toonie.c
@@ -22,7 +22,6 @@
22#include <linux/init.h> 22#include <linux/init.h>
23#include <linux/delay.h> 23#include <linux/delay.h>
24#include <linux/i2c.h> 24#include <linux/i2c.h>
25#include <linux/i2c-dev.h>
26#include <linux/kmod.h> 25#include <linux/kmod.h>
27#include <linux/slab.h> 26#include <linux/slab.h>
28#include <linux/interrupt.h> 27#include <linux/interrupt.h>
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 838fc113c44..1146dd882bb 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -28,7 +28,6 @@
28#include <linux/init.h> 28#include <linux/init.h>
29#include <linux/delay.h> 29#include <linux/delay.h>
30#include <linux/i2c.h> 30#include <linux/i2c.h>
31#include <linux/i2c-dev.h>
32#include <linux/kmod.h> 31#include <linux/kmod.h>
33#include <linux/slab.h> 32#include <linux/slab.h>
34#include <linux/interrupt.h> 33#include <linux/interrupt.h>