diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:42:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:42:38 -0300 |
| commit | 6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9 (patch) | |
| tree | f1ba4993d5a649af938967c928f1a78e945f747a /linux/drivers/media/dvb | |
| parent | 503d9b1655773c65ef2d3c1d7f6e67c91717ec74 (diff) | |
| parent | 32027c8007a8b9e82f70f5eb52387db827ff8b2d (diff) | |
| download | mediapointer-dvb-s2-6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9.tar.gz mediapointer-dvb-s2-6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9.tar.bz2 | |
Merge from mchehab saa7115 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/frontends/Kconfig b/linux/drivers/media/dvb/frontends/Kconfig index a1a894d81..94233168d 100644 --- a/linux/drivers/media/dvb/frontends/Kconfig +++ b/linux/drivers/media/dvb/frontends/Kconfig @@ -161,7 +161,7 @@ comment "ATSC (North American/Korean Terresterial DTV) frontends" depends on DVB_CORE config DVB_NXT200X - tristate "Nextwave NXT2002/NXT2004 based" + tristate "NxtWave Communications NXT2002/NXT2004 based" depends on DVB_CORE select FW_LOADER help @@ -175,14 +175,14 @@ config DVB_NXT200X or /lib/firmware (depending on configuration of firmware hotplug). config DVB_OR51211 - tristate "or51211 based (pcHDTV HD2000 card)" + tristate "Oren OR51211 based" depends on DVB_CORE select FW_LOADER help An ATSC 8VSB tuner module. Say Y when you want to support this frontend. config DVB_OR51132 - tristate "OR51132 based (pcHDTV HD3000 card)" + tristate "Oren OR51132 based" depends on DVB_CORE select FW_LOADER help |