diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:21:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:21:00 -0400 |
| commit | f74b9444192c60603020c61d7915b72893137edc (patch) | |
| tree | 8b1d16d373234038c2b045c9ceb3c33b93059e8a /drivers/tty/tty_io.c | |
| parent | 7a6362800cb7d1d618a697a650c7aaed3eb39320 (diff) | |
| parent | 4ba8216cd90560bc402f52076f64d8546e8aefcb (diff) | |
Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
BKL: That's all, folks
fs/locks.c: Remove stale FIXME left over from BKL conversion
ipx: remove the BKL
appletalk: remove the BKL
x25: remove the BKL
ufs: remove the BKL
hpfs: remove the BKL
drivers: remove extraneous includes of smp_lock.h
tracing: don't trace the BKL
adfs: remove the big kernel lock
Diffstat (limited to 'drivers/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 8ef2d69470ec..936a4ead6c21 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> |