summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/Kconfig
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-02-02 08:38:15 +0300
committerTejun Heo <tj@kernel.org>2010-02-02 08:38:15 +0300
commitab386128f20c44c458a90039ab1bdc265ac474c9 (patch)
tree2ad188744922b1bb951fd10ff50dc04c83acce22 /drivers/media/dvb/Kconfig
parentdbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff)
parentab658321f32770b903a4426e2a6fae0392757755 (diff)
downloadlinux-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.xz
Merge branch 'master' into percpu
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 35d0817126e9..cf8f65f309da 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -72,6 +72,10 @@ comment "Supported Earthsoft PT1 Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/pt1/Kconfig"
+comment "Supported Mantis Adapters"
+ depends on DVB_CORE && PCI && I2C
+ source "drivers/media/dvb/mantis/Kconfig"
+
comment "Supported DVB Frontends"
depends on DVB_CORE
source "drivers/media/dvb/frontends/Kconfig"