diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-06-04 05:42:32 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 13:49:20 -0400 |
commit | be2a9fae7be36864777e4b66f925d7af11578d99 (patch) | |
tree | d53d317b844b2cce08d9e16ced0b6b2253b600d4 /drivers/media/video/gspca | |
parent | 2584bc4337855382d23b4abfc2e2492df6fdeb41 (diff) |
V4L/DVB: gspca: Remove/move useless inclusions of slab.h
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r-- | drivers/media/video/gspca/gspca.h | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_bridge.h | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_s5k83a.c | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/sn9c20x.c | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx.h | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/t613.c | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/zc3xx.c | 1 |
8 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 3215e4216a31..d181064653b7 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <linux/videodev2.h> | 7 | #include <linux/videodev2.h> |
8 | #include <media/v4l2-common.h> | 8 | #include <media/v4l2-common.h> |
9 | #include <linux/mutex.h> | 9 | #include <linux/mutex.h> |
10 | #include <linux/slab.h> | ||
11 | 10 | ||
12 | /* compilation option */ | 11 | /* compilation option */ |
13 | #define GSPCA_DEBUG 1 | 12 | #define GSPCA_DEBUG 1 |
diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h index 1127a405c9b2..51af3ee3ab85 100644 --- a/drivers/media/video/gspca/m5602/m5602_bridge.h +++ b/drivers/media/video/gspca/m5602/m5602_bridge.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #ifndef M5602_BRIDGE_H_ | 19 | #ifndef M5602_BRIDGE_H_ |
20 | #define M5602_BRIDGE_H_ | 20 | #define M5602_BRIDGE_H_ |
21 | 21 | ||
22 | #include <linux/slab.h> | ||
22 | #include "gspca.h" | 23 | #include "gspca.h" |
23 | 24 | ||
24 | #define MODULE_NAME "ALi m5602" | 25 | #define MODULE_NAME "ALi m5602" |
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c index 6b3be4fa2c06..fbd91545497a 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c +++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c | |||
@@ -17,7 +17,6 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/kthread.h> | 19 | #include <linux/kthread.h> |
20 | #include <linux/slab.h> | ||
21 | #include "m5602_s5k83a.h" | 20 | #include "m5602_s5k83a.h" |
22 | 21 | ||
23 | static int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val); | 22 | static int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val); |
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c index 3f7e446d688a..83a718f0f3f9 100644 --- a/drivers/media/video/gspca/sn9c20x.c +++ b/drivers/media/video/gspca/sn9c20x.c | |||
@@ -20,7 +20,6 @@ | |||
20 | 20 | ||
21 | #ifdef CONFIG_INPUT | 21 | #ifdef CONFIG_INPUT |
22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
23 | #include <linux/slab.h> | ||
24 | #endif | 23 | #endif |
25 | 24 | ||
26 | #include "gspca.h" | 25 | #include "gspca.h" |
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 176c5b3d5e6f..d5fe1f6f4264 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #define MODULE_NAME "sonixj" | 22 | #define MODULE_NAME "sonixj" |
23 | 23 | ||
24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
25 | #include <linux/slab.h> | ||
26 | #include "gspca.h" | 25 | #include "gspca.h" |
27 | #include "jpeg.h" | 26 | #include "jpeg.h" |
28 | 27 | ||
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.h b/drivers/media/video/gspca/stv06xx/stv06xx.h index 992ce530f138..053a27e3a400 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.h +++ b/drivers/media/video/gspca/stv06xx/stv06xx.h | |||
@@ -30,6 +30,7 @@ | |||
30 | #ifndef STV06XX_H_ | 30 | #ifndef STV06XX_H_ |
31 | #define STV06XX_H_ | 31 | #define STV06XX_H_ |
32 | 32 | ||
33 | #include <linux/slab.h> | ||
33 | #include "gspca.h" | 34 | #include "gspca.h" |
34 | 35 | ||
35 | #define MODULE_NAME "STV06xx" | 36 | #define MODULE_NAME "STV06xx" |
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c index 4e8df337bc83..f5d006b28c36 100644 --- a/drivers/media/video/gspca/t613.c +++ b/drivers/media/video/gspca/t613.c | |||
@@ -28,6 +28,7 @@ | |||
28 | 28 | ||
29 | #define MODULE_NAME "t613" | 29 | #define MODULE_NAME "t613" |
30 | 30 | ||
31 | #include <linux/slab.h> | ||
31 | #include "gspca.h" | 32 | #include "gspca.h" |
32 | 33 | ||
33 | #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0) | 34 | #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0) |
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 1420eb2a9d38..d7587cd5a260 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #define MODULE_NAME "zc3xx" | 22 | #define MODULE_NAME "zc3xx" |
23 | 23 | ||
24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
25 | #include <linux/slab.h> | ||
26 | #include "gspca.h" | 25 | #include "gspca.h" |
27 | #include "jpeg.h" | 26 | #include "jpeg.h" |
28 | 27 | ||