diff options
author | Linus Torvalds | 2011-03-17 01:21:00 +0100 |
---|---|---|
committer | Linus Torvalds | 2011-03-17 01:21:00 +0100 |
commit | f74b9444192c60603020c61d7915b72893137edc (patch) | |
tree | 8b1d16d373234038c2b045c9ceb3c33b93059e8a /drivers/staging | |
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 | kernel-qcow2-linux-f74b9444192c60603020c61d7915b72893137edc.tar.gz kernel-qcow2-linux-f74b9444192c60603020c61d7915b72893137edc.tar.xz kernel-qcow2-linux-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/staging')
-rw-r--r-- | drivers/staging/easycap/easycap_ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c index 64e7ecd4169f..28a28e02c9ce 100644 --- a/drivers/staging/easycap/easycap_ioctl.c +++ b/drivers/staging/easycap/easycap_ioctl.c @@ -25,7 +25,6 @@ */ /*****************************************************************************/ -#include <linux/smp_lock.h> #include "easycap.h" /*--------------------------------------------------------------------------*/ |