diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:21:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:21:00 -0700 |
| commit | f74b9444192c60603020c61d7915b72893137edc (patch) | |
| tree | 8b1d16d373234038c2b045c9ceb3c33b93059e8a /drivers/tty/vt/vt_ioctl.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 (diff) | |
| parent | BKL: That's all, folks (diff) | |
| download | linux-dev-f74b9444192c60603020c61d7915b72893137edc.tar.xz linux-dev-f74b9444192c60603020c61d7915b72893137edc.zip | |
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/vt/vt_ioctl.c')
| -rw-r--r-- | drivers/tty/vt/vt_ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index b64804965316..937d17219984 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -27,7 +27,6 @@ #include <linux/console.h> #include <linux/consolemap.h> #include <linux/signal.h> -#include <linux/smp_lock.h> #include <linux/timex.h> #include <asm/io.h> |