aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/easycap/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-24 13:17:06 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-24 13:17:06 -0800
commite92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch)
tree6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /drivers/staging/easycap/Kconfig
parentnet: arp_ioctl() must hold RTNL (diff)
parentfix a shutdown regression in intel_idle (diff)
downloadlinux-dev-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.tar.xz
linux-dev-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/staging/easycap/Kconfig')
-rw-r--r--drivers/staging/easycap/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/easycap/Kconfig b/drivers/staging/easycap/Kconfig
index 9d5fe4ddc30a..bd96f39f2735 100644
--- a/drivers/staging/easycap/Kconfig
+++ b/drivers/staging/easycap/Kconfig
@@ -1,7 +1,6 @@
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