aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-01-25 16:08:05 -0500
committerArnd Bergmann <arnd@arndb.de>2011-03-01 18:02:40 -0500
commit5edc341313a188d94cde7ef87ac31647cea8601a (patch)
tree081cb8074de5abb9592e38e314505998bf99cd90 /drivers
parentf51b452bed4ae5c20e1f8a790e4ed8663d909a40 (diff)
drivers: remove extraneous includes of smp_lock.h
These were missed the last time I cleaned this up globally, because of code moving around or new code getting merged. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fp.c1
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.c1
-rw-r--r--drivers/staging/easycap/easycap_ioctl.c1
-rw-r--r--drivers/target/target_core_device.c1
-rw-r--r--drivers/target/target_core_fabric_lib.c1
-rw-r--r--drivers/target/target_core_file.c1
-rw-r--r--drivers/target/target_core_hba.c1
-rw-r--r--drivers/target/target_core_iblock.c1
-rw-r--r--drivers/target/target_core_pscsi.c1
-rw-r--r--drivers/target/target_core_rd.c1
-rw-r--r--drivers/target/target_core_tpg.c1
-rw-r--r--drivers/target/target_core_transport.c1
-rw-r--r--drivers/tty/n_hdlc.c1
-rw-r--r--drivers/tty/n_r3964.c1
-rw-r--r--drivers/tty/pty.c1
-rw-r--r--drivers/tty/tty_io.c1
-rw-r--r--drivers/tty/tty_ldisc.c2
-rw-r--r--drivers/tty/vt/selection.c1
-rw-r--r--drivers/tty/vt/vc_screen.c1
-rw-r--r--drivers/tty/vt/vt.c1
-rw-r--r--drivers/tty/vt/vt_ioctl.c1
21 files changed, 0 insertions, 22 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
index 53fa96ae2b3e..8fe3a45794fc 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -39,7 +39,6 @@
39#include <linux/spinlock.h> 39#include <linux/spinlock.h>
40#include <linux/interrupt.h> 40#include <linux/interrupt.h>
41#include <linux/delay.h> 41#include <linux/delay.h>
42#include <linux/smp_lock.h>
43#include <linux/uio.h> 42#include <linux/uio.h>
44#include <linux/uaccess.h> 43#include <linux/uaccess.h>
45#include <linux/fs.h> 44#include <linux/fs.h>
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index c1e09d5a6196..d6e2a663b165 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -38,7 +38,6 @@
38#include <linux/spinlock.h> 38#include <linux/spinlock.h>
39#include <linux/interrupt.h> 39#include <linux/interrupt.h>
40#include <linux/delay.h> 40#include <linux/delay.h>
41#include <linux/smp_lock.h>
42#include <linux/uio.h> 41#include <linux/uio.h>
43#include <linux/uaccess.h> 42#include <linux/uaccess.h>
44#include <linux/fs.h> 43#include <linux/fs.h>
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c
index 447953a4e80c..c1a0c9c90a6c 100644
--- a/drivers/staging/easycap/easycap_ioctl.c
+++ b/drivers/staging/easycap/easycap_ioctl.c
@@ -25,7 +25,6 @@
25*/ 25*/
26/*****************************************************************************/ 26/*****************************************************************************/
27 27
28#include <linux/smp_lock.h>
29#include "easycap.h" 28#include "easycap.h"
30#include "easycap_debug.h" 29#include "easycap_debug.h"
31#include "easycap_standard.h" 30#include "easycap_standard.h"
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 5da051a07fa3..350ed401544e 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -33,7 +33,6 @@
33#include <linux/timer.h> 33#include <linux/timer.h>
34#include <linux/slab.h> 34#include <linux/slab.h>
35#include <linux/spinlock.h> 35#include <linux/spinlock.h>
36#include <linux/smp_lock.h>
37#include <linux/kthread.h> 36#include <linux/kthread.h>
38#include <linux/in.h> 37#include <linux/in.h>
39#include <net/sock.h> 38#include <net/sock.h>
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index 26285644e4de..a3c695adabec 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -28,7 +28,6 @@
28#include <linux/string.h> 28#include <linux/string.h>
29#include <linux/ctype.h> 29#include <linux/ctype.h>
30#include <linux/spinlock.h> 30#include <linux/spinlock.h>
31#include <linux/smp_lock.h>
32#include <scsi/scsi.h> 31#include <scsi/scsi.h>
33#include <scsi/scsi_cmnd.h> 32#include <scsi/scsi_cmnd.h>
34 33
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 0aaca885668f..190ca8ac2498 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -33,7 +33,6 @@
33#include <linux/blkdev.h> 33#include <linux/blkdev.h>
34#include <linux/slab.h> 34#include <linux/slab.h>
35#include <linux/spinlock.h> 35#include <linux/spinlock.h>
36#include <linux/smp_lock.h>
37#include <scsi/scsi.h> 36#include <scsi/scsi.h>
38#include <scsi/scsi_host.h> 37#include <scsi/scsi_host.h>
39 38
diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c
index 4bbe8208b241..73f7d6d81b4c 100644
--- a/drivers/target/target_core_hba.c
+++ b/drivers/target/target_core_hba.c
@@ -31,7 +31,6 @@
31#include <linux/timer.h> 31#include <linux/timer.h>
32#include <linux/slab.h> 32#include <linux/slab.h>
33#include <linux/spinlock.h> 33#include <linux/spinlock.h>
34#include <linux/smp_lock.h>
35#include <linux/in.h> 34#include <linux/in.h>
36#include <net/sock.h> 35#include <net/sock.h>
37#include <net/tcp.h> 36#include <net/tcp.h>
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 67f0c09983c8..3df570db0e4f 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -35,7 +35,6 @@
35#include <linux/blkdev.h> 35#include <linux/blkdev.h>
36#include <linux/slab.h> 36#include <linux/slab.h>
37#include <linux/spinlock.h> 37#include <linux/spinlock.h>
38#include <linux/smp_lock.h>
39#include <linux/bio.h> 38#include <linux/bio.h>
40#include <linux/genhd.h> 39#include <linux/genhd.h>
41#include <linux/file.h> 40#include <linux/file.h>
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index f2a08477a68c..5a9d2ba4b609 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -34,7 +34,6 @@
34#include <linux/blk_types.h> 34#include <linux/blk_types.h>
35#include <linux/slab.h> 35#include <linux/slab.h>
36#include <linux/spinlock.h> 36#include <linux/spinlock.h>
37#include <linux/smp_lock.h>
38#include <linux/genhd.h> 37#include <linux/genhd.h>
39#include <linux/cdrom.h> 38#include <linux/cdrom.h>
40#include <linux/file.h> 39#include <linux/file.h>
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index 979aebf20019..8dc6d74c1d40 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -34,7 +34,6 @@
34#include <linux/blkdev.h> 34#include <linux/blkdev.h>
35#include <linux/slab.h> 35#include <linux/slab.h>
36#include <linux/spinlock.h> 36#include <linux/spinlock.h>
37#include <linux/smp_lock.h>
38#include <scsi/scsi.h> 37#include <scsi/scsi.h>
39#include <scsi/scsi_host.h> 38#include <scsi/scsi_host.h>
40 39
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index c26f67467623..5ec745fed931 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -31,7 +31,6 @@
31#include <linux/timer.h> 31#include <linux/timer.h>
32#include <linux/slab.h> 32#include <linux/slab.h>
33#include <linux/spinlock.h> 33#include <linux/spinlock.h>
34#include <linux/smp_lock.h>
35#include <linux/in.h> 34#include <linux/in.h>
36#include <net/sock.h> 35#include <net/sock.h>
37#include <net/tcp.h> 36#include <net/tcp.h>
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 236e22d8cfae..121445f21c71 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -34,7 +34,6 @@
34#include <linux/slab.h> 34#include <linux/slab.h>
35#include <linux/blkdev.h> 35#include <linux/blkdev.h>
36#include <linux/spinlock.h> 36#include <linux/spinlock.h>
37#include <linux/smp_lock.h>
38#include <linux/kthread.h> 37#include <linux/kthread.h>
39#include <linux/in.h> 38#include <linux/in.h>
40#include <linux/cdrom.h> 39#include <linux/cdrom.h>
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index 52fc0c9a6364..cea56033b34c 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -97,7 +97,6 @@
97#include <linux/slab.h> 97#include <linux/slab.h>
98#include <linux/tty.h> 98#include <linux/tty.h>
99#include <linux/errno.h> 99#include <linux/errno.h>
100#include <linux/smp_lock.h>
101#include <linux/string.h> /* used in new tty drivers */ 100#include <linux/string.h> /* used in new tty drivers */
102#include <linux/signal.h> /* used in new tty drivers */ 101#include <linux/signal.h> /* used in new tty drivers */
103#include <linux/if.h> 102#include <linux/if.h>
diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c
index 88dda0c45ee0..5c6c31459a2f 100644
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
@@ -57,7 +57,6 @@
57#include <linux/ioport.h> 57#include <linux/ioport.h>
58#include <linux/in.h> 58#include <linux/in.h>
59#include <linux/slab.h> 59#include <linux/slab.h>
60#include <linux/smp_lock.h>
61#include <linux/tty.h> 60#include <linux/tty.h>
62#include <linux/errno.h> 61#include <linux/errno.h>
63#include <linux/string.h> /* used in new tty drivers */ 62#include <linux/string.h> /* used in new tty drivers */
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 923a48585501..2310cb7282ff 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -23,7 +23,6 @@
23#include <linux/major.h> 23#include <linux/major.h>
24#include <linux/mm.h> 24#include <linux/mm.h>
25#include <linux/init.h> 25#include <linux/init.h>
26#include <linux/smp_lock.h>
27#include <linux/sysctl.h> 26#include <linux/sysctl.h>
28#include <linux/device.h> 27#include <linux/device.h>
29#include <linux/uaccess.h> 28#include <linux/uaccess.h>
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 0065da4b11c1..cf73d5bd0dce 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -90,7 +90,6 @@
90#include <linux/proc_fs.h> 90#include <linux/proc_fs.h>
91#include <linux/init.h> 91#include <linux/init.h>
92#include <linux/module.h> 92#include <linux/module.h>
93#include <linux/smp_lock.h>
94#include <linux/device.h> 93#include <linux/device.h>
95#include <linux/wait.h> 94#include <linux/wait.h>
96#include <linux/bitops.h> 95#include <linux/bitops.h>
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 4214d58276f7..70808adae334 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -34,8 +34,6 @@
34#include <linux/vt_kern.h> 34#include <linux/vt_kern.h>
35#include <linux/selection.h> 35#include <linux/selection.h>
36 36
37#include <linux/smp_lock.h> /* For the moment */
38
39#include <linux/kmod.h> 37#include <linux/kmod.h>
40#include <linux/nsproxy.h> 38#include <linux/nsproxy.h>
41 39
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index c956ed6c83a3..adf0ad2a8851 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -26,7 +26,6 @@
26#include <linux/selection.h> 26#include <linux/selection.h>
27#include <linux/tiocl.h> 27#include <linux/tiocl.h>
28#include <linux/console.h> 28#include <linux/console.h>
29#include <linux/smp_lock.h>
30 29
31/* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */ 30/* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */
32#define isspace(c) ((c) == ' ') 31#define isspace(c) ((c) == ' ')
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index a672ed192d33..95e05dfc437c 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -34,7 +34,6 @@
34#include <linux/kbd_kern.h> 34#include <linux/kbd_kern.h>
35#include <linux/console.h> 35#include <linux/console.h>
36#include <linux/device.h> 36#include <linux/device.h>
37#include <linux/smp_lock.h>
38#include <linux/sched.h> 37#include <linux/sched.h>
39#include <linux/fs.h> 38#include <linux/fs.h>
40#include <linux/poll.h> 39#include <linux/poll.h>
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 147ede3423df..2178efcec1b5 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -89,7 +89,6 @@
89#include <linux/mutex.h> 89#include <linux/mutex.h>
90#include <linux/vt_kern.h> 90#include <linux/vt_kern.h>
91#include <linux/selection.h> 91#include <linux/selection.h>
92#include <linux/smp_lock.h>
93#include <linux/tiocl.h> 92#include <linux/tiocl.h>
94#include <linux/kbd_kern.h> 93#include <linux/kbd_kern.h>
95#include <linux/consolemap.h> 94#include <linux/consolemap.h>
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 1235ebda6e1c..fd4c9376f875 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -27,7 +27,6 @@
27#include <linux/console.h> 27#include <linux/console.h>
28#include <linux/consolemap.h> 28#include <linux/consolemap.h>
29#include <linux/signal.h> 29#include <linux/signal.h>
30#include <linux/smp_lock.h>
31#include <linux/timex.h> 30#include <linux/timex.h>
32 31
33#include <asm/io.h> 32#include <asm/io.h>