From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2011 00:21:00 +0000 (-0700)
Subject: Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f74b9444192c60603020c61d7915b72893137edc;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'config' of git://git./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
---

f74b9444192c60603020c61d7915b72893137edc
diff --cc drivers/staging/easycap/easycap_ioctl.c
index 64e7ecd4169f,c1a0c9c90a6c..28a28e02c9ce
--- a/drivers/staging/easycap/easycap_ioctl.c
+++ b/drivers/staging/easycap/easycap_ioctl.c
@@@ -25,8 -25,10 +25,7 @@@
  */
  /*****************************************************************************/
  
- #include <linux/smp_lock.h>
  #include "easycap.h"
 -#include "easycap_debug.h"
 -#include "easycap_standard.h"
 -#include "easycap_ioctl.h"
  
  /*--------------------------------------------------------------------------*/
  /*