summaryrefslogtreecommitdiff
path: root/drivers/media/usb/usbtv/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-08-14 14:14:12 +0400
committerIngo Molnar <mingo@kernel.org>2013-08-14 14:14:12 +0400
commit397f09977ea350a20f20b415a9313cc790137742 (patch)
tree0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /drivers/media/usb/usbtv/Kconfig
parent6356bb0ad6525dae93c06478a098ed3848e9ab01 (diff)
parenta4b4bedce880046feeb5b206392960f395ed02ad (diff)
downloadlinux-397f09977ea350a20f20b415a9313cc790137742.tar.xz
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC support, from Borislav Petkov. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/usb/usbtv/Kconfig')
-rw-r--r--drivers/media/usb/usbtv/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/usbtv/Kconfig b/drivers/media/usb/usbtv/Kconfig
index 8864436464bf..7c5b86006ee6 100644
--- a/drivers/media/usb/usbtv/Kconfig
+++ b/drivers/media/usb/usbtv/Kconfig
@@ -1,6 +1,6 @@
config VIDEO_USBTV
tristate "USBTV007 video capture support"
- depends on VIDEO_DEV
+ depends on VIDEO_V4L2
select VIDEOBUF2_VMALLOC
---help---