summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/Kconfig
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-14 14:18:01 -0600
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-14 14:18:01 -0600
commitf33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch)
treeb027b5f3429d416b3da5b9195024007dab062a5e /drivers/media/dvb/frontends/Kconfig
parente935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff)
parent67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff)
downloadblackbird-obmc-linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.tar.gz
blackbird-obmc-linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.zip
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/dvb/frontends/Kconfig')
-rw-r--r--drivers/media/dvb/frontends/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 76b6a2aef32f..c676b1e23ab0 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -29,7 +29,7 @@ config DVB_TDA8083
A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_MT312
- tristate "Zarlink MT312 based"
+ tristate "Zarlink VP310/MT312 based"
depends on DVB_CORE
help
A DVB-S tuner module. Say Y when you want to support this frontend.
OpenPOWER on IntegriCloud