aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-09-07 14:18:36 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-09-07 14:18:36 -0700
commit7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch)
tree56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/media/dvb/Kconfig
parentInput: tsc2007 - add open and close methods (diff)
parentLinux 3.1-rc4 (diff)
downloadlinux-dev-7e66eaf14e19c032433be7c4df3c892fa2a5282f.tar.xz
linux-dev-7e66eaf14e19c032433be7c4df3c892fa2a5282f.zip
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/media/dvb/Kconfig')
-rw-r--r--drivers/media/dvb/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index ee214c3b63d7..f6e40b3a44cc 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -80,6 +80,10 @@ comment "Supported nGene Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/ngene/Kconfig"
+comment "Supported ddbridge ('Octopus') Adapters"
+ depends on DVB_CORE && PCI && I2C
+ source "drivers/media/dvb/ddbridge/Kconfig"
+
comment "Supported DVB Frontends"
depends on DVB_CORE
source "drivers/media/dvb/frontends/Kconfig"