diff options
| author | Linus Torvalds | 2010-10-22 19:43:11 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-10-22 19:43:11 +0200 |
| commit | 5704e44d283e907623e3775c1262f206a2c48cf3 (patch) | |
| tree | 0a981b24173e90854e7b7d812b35859e1e5f0174 /drivers/staging/easycap | |
| parent | Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | BKL: introduce CONFIG_BKL. (diff) | |
| download | kernel-qcow2-linux-5704e44d283e907623e3775c1262f206a2c48cf3.tar.gz kernel-qcow2-linux-5704e44d283e907623e3775c1262f206a2c48cf3.tar.xz kernel-qcow2-linux-5704e44d283e907623e3775c1262f206a2c48cf3.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: introduce CONFIG_BKL.
dabusb: remove the BKL
sunrpc: remove the big kernel lock
init/main.c: remove BKL notations
blktrace: remove the big kernel lock
rtmutex-tester: make it build without BKL
dvb-core: kill the big kernel lock
dvb/bt8xx: kill the big kernel lock
tlclk: remove big kernel lock
fix rawctl compat ioctls breakage on amd64 and itanic
uml: kill big kernel lock
parisc: remove big kernel lock
cris: autoconvert trivial BKL users
alpha: kill big kernel lock
isapnp: BKL removal
s390/block: kill the big kernel lock
hpet: kill BKL, add compat_ioctl
Diffstat (limited to 'drivers/staging/easycap')
| -rw-r--r-- | drivers/staging/easycap/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/easycap/Kconfig b/drivers/staging/easycap/Kconfig index bd96f39f2735..9d5fe4ddc30a 100644 --- a/drivers/staging/easycap/Kconfig +++ b/drivers/staging/easycap/Kconfig @@ -1,6 +1,7 @@ config EASYCAP tristate "EasyCAP USB ID 05e1:0408 support" depends on USB && VIDEO_DEV + depends on BKL # please fix ---help--- This is an integrated audio/video driver for EasyCAP cards with |