diff options
author | David S. Miller | 2009-12-12 02:12:17 +0100 |
---|---|---|
committer | David S. Miller | 2009-12-12 02:12:17 +0100 |
commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/media/dvb/dvb-usb/Kconfig | |
parent | net: Handle NETREG_UNINITIALIZED devices correctly (diff) | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cp... (diff) | |
download | kernel-qcow2-linux-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.gz kernel-qcow2-linux-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.xz kernel-qcow2-linux-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'drivers/media/dvb/dvb-usb/Kconfig')
-rw-r--r-- | drivers/media/dvb/dvb-usb/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig index 0e4b97fba384..2dee1bf73577 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig @@ -322,3 +322,11 @@ config DVB_USB_FRIIO depends on DVB_USB help Say Y here to support the Japanese DTV receiver Friio. + +config DVB_USB_EC168 + tristate "E3C EC168 DVB-T USB2.0 support" + depends on DVB_USB && EXPERIMENTAL + select DVB_EC100 + select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE + help + Say Y here to support the E3C EC168 DVB-T USB2.0 receiver. |