diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-05-08 03:28:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:07 -0400 |
commit | e63340ae6b6205fef26b40a75673d1c9c0c8bb90 (patch) | |
tree | 8d3212705515edec73c3936bb9e23c71d34a7b41 /drivers/media/video | |
parent | 04c9167f91e309c9c4ea982992aa08e83b2eb42e (diff) |
header cleaning: don't include smp_lock.h when not used
Remove includes of <linux/smp_lock.h> where it is not used/needed.
Suggested by Al Viro.
Builds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc,
sparc64, and arm (all 59 defconfigs).
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cpia.h | 1 | ||||
-rw-r--r-- | drivers/media/video/cpia_pp.c | 1 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-tvaudio.c | 1 | ||||
-rw-r--r-- | drivers/media/video/dabusb.c | 1 | ||||
-rw-r--r-- | drivers/media/video/ov511.h | 1 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-main.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-tvaudio.c | 1 | ||||
-rw-r--r-- | drivers/media/video/se401.h | 1 | ||||
-rw-r--r-- | drivers/media/video/tvaudio.c | 1 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/usbvideo.c | 1 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 1 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 1 | ||||
-rw-r--r-- | drivers/media/video/v4l1-compat.c | 1 | ||||
-rw-r--r-- | drivers/media/video/v4l2-common.c | 1 | ||||
-rw-r--r-- | drivers/media/video/videodev.c | 1 |
15 files changed, 0 insertions, 15 deletions
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h index 6eaa692021c5..78392fb6f94e 100644 --- a/drivers/media/video/cpia.h +++ b/drivers/media/video/cpia.h | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/videodev.h> | 47 | #include <linux/videodev.h> |
48 | #include <media/v4l2-common.h> | 48 | #include <media/v4l2-common.h> |
49 | #include <linux/list.h> | 49 | #include <linux/list.h> |
50 | #include <linux/smp_lock.h> | ||
51 | #include <linux/mutex.h> | 50 | #include <linux/mutex.h> |
52 | 51 | ||
53 | struct cpia_camera_ops | 52 | struct cpia_camera_ops |
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c index 19711aaf9a3e..c431df8248d6 100644 --- a/drivers/media/video/cpia_pp.c +++ b/drivers/media/video/cpia_pp.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
36 | #include <linux/workqueue.h> | 36 | #include <linux/workqueue.h> |
37 | #include <linux/smp_lock.h> | ||
38 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
39 | 38 | ||
40 | #include <linux/kmod.h> | 39 | #include <linux/kmod.h> |
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index e627062fde3a..259ea08e784f 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include <linux/interrupt.h> | 49 | #include <linux/interrupt.h> |
50 | #include <linux/vmalloc.h> | 50 | #include <linux/vmalloc.h> |
51 | #include <linux/init.h> | 51 | #include <linux/init.h> |
52 | #include <linux/smp_lock.h> | ||
53 | #include <linux/delay.h> | 52 | #include <linux/delay.h> |
54 | #include <linux/kthread.h> | 53 | #include <linux/kthread.h> |
55 | 54 | ||
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index ff4b238090ac..a5731f90be0f 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <asm/atomic.h> | 37 | #include <asm/atomic.h> |
38 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
39 | #include <linux/usb.h> | 39 | #include <linux/usb.h> |
40 | #include <linux/smp_lock.h> | ||
41 | #include <linux/mutex.h> | 40 | #include <linux/mutex.h> |
42 | 41 | ||
43 | #include "dabusb.h" | 42 | #include "dabusb.h" |
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h index 68b082bcee1d..18c64222dd11 100644 --- a/drivers/media/video/ov511.h +++ b/drivers/media/video/ov511.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #include <asm/uaccess.h> | 4 | #include <asm/uaccess.h> |
5 | #include <linux/videodev.h> | 5 | #include <linux/videodev.h> |
6 | #include <media/v4l2-common.h> | 6 | #include <media/v4l2-common.h> |
7 | #include <linux/smp_lock.h> | ||
8 | #include <linux/usb.h> | 7 | #include <linux/usb.h> |
9 | #include <linux/mutex.h> | 8 | #include <linux/mutex.h> |
10 | 9 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c index e976c484c058..9ea41c6699bb 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/drivers/media/video/pvrusb2/pvrusb2-main.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
28 | #include <linux/smp_lock.h> | ||
29 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
30 | #include <linux/videodev2.h> | 29 | #include <linux/videodev2.h> |
31 | 30 | ||
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c index dd759d6d8d25..7b56041186dc 100644 --- a/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/drivers/media/video/saa7134/saa7134-tvaudio.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/smp_lock.h> | ||
31 | #include <asm/div64.h> | 30 | #include <asm/div64.h> |
32 | 31 | ||
33 | #include "saa7134-reg.h" | 32 | #include "saa7134-reg.h" |
diff --git a/drivers/media/video/se401.h b/drivers/media/video/se401.h index c0891b3e0018..835ef872e803 100644 --- a/drivers/media/video/se401.h +++ b/drivers/media/video/se401.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <asm/uaccess.h> | 5 | #include <asm/uaccess.h> |
6 | #include <linux/videodev.h> | 6 | #include <linux/videodev.h> |
7 | #include <media/v4l2-common.h> | 7 | #include <media/v4l2-common.h> |
8 | #include <linux/smp_lock.h> | ||
9 | #include <linux/mutex.h> | 8 | #include <linux/mutex.h> |
10 | 9 | ||
11 | #define se401_DEBUG /* Turn on debug messages */ | 10 | #define se401_DEBUG /* Turn on debug messages */ |
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index a2da5d2affff..c9bf9dbc2ea3 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/videodev.h> | 26 | #include <linux/videodev.h> |
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/smp_lock.h> | ||
30 | #include <linux/kthread.h> | 29 | #include <linux/kthread.h> |
31 | #include <linux/freezer.h> | 30 | #include <linux/freezer.h> |
32 | 31 | ||
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 687f026753b2..37ce36b9e587 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
23 | #include <linux/smp_lock.h> | ||
24 | #include <linux/vmalloc.h> | 23 | #include <linux/vmalloc.h> |
25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
26 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index bcb551adb7e6..9118a6227ea6 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
31 | #include <linux/utsname.h> | 31 | #include <linux/utsname.h> |
32 | #include <linux/highmem.h> | 32 | #include <linux/highmem.h> |
33 | #include <linux/smp_lock.h> | ||
34 | #include <linux/videodev.h> | 33 | #include <linux/videodev.h> |
35 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 216704170a4c..aa3258bbb4af 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -52,7 +52,6 @@ | |||
52 | #include <linux/mm.h> | 52 | #include <linux/mm.h> |
53 | #include <linux/utsname.h> | 53 | #include <linux/utsname.h> |
54 | #include <linux/highmem.h> | 54 | #include <linux/highmem.h> |
55 | #include <linux/smp_lock.h> | ||
56 | #include <linux/videodev.h> | 55 | #include <linux/videodev.h> |
57 | #include <linux/vmalloc.h> | 56 | #include <linux/vmalloc.h> |
58 | #include <linux/module.h> | 57 | #include <linux/module.h> |
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c index d2c1ae0dbfba..a861e150865e 100644 --- a/drivers/media/video/v4l1-compat.c +++ b/drivers/media/video/v4l1-compat.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
26 | #include <linux/smp_lock.h> | ||
27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
28 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
29 | #include <linux/file.h> | 28 | #include <linux/file.h> |
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 49f1df74aa21..13ee550d3215 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
48 | #include <linux/types.h> | 48 | #include <linux/types.h> |
49 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
50 | #include <linux/smp_lock.h> | ||
51 | #include <linux/mm.h> | 50 | #include <linux/mm.h> |
52 | #include <linux/string.h> | 51 | #include <linux/string.h> |
53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 80ac5f86d9e5..5263b50463e1 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
33 | #include <linux/smp_lock.h> | ||
34 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
35 | #include <linux/string.h> | 34 | #include <linux/string.h> |
36 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |