diff options
| author |   Johannes Stezenbach <js@linuxtv.org> | 2005-05-16 21:54:38 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 07:59:32 -0700 |
| commit | 0b3f5a57bf110b519b706365c86ada199075f34e (patch) | |
| tree | aaf3a3f19d4f122331180d2127764387d7a59dc9 /drivers/media | |
| parent | [PATCH] dvb: make needlessly global code static or drop it (diff) | |
| download | linux-dev-0b3f5a57bf110b519b706365c86ada199075f34e.tar.xz linux-dev-0b3f5a57bf110b519b706365c86ada199075f34e.zip | |
[PATCH] dvb: frontends: misc. minor cleanups
misc. minor cleanups, select FW_LOADER and add a help text to DVB_OR51132
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/dvb/frontends/Kconfig | 22 | ||||
| -rw-r--r-- | drivers/media/dvb/frontends/mt352.h | 6 | ||||
| -rw-r--r-- | drivers/media/dvb/frontends/nxt2002.c | 2 | ||||
| -rw-r--r-- | drivers/media/dvb/frontends/tda80xx.c | 2 |
4 files changed, 14 insertions, 18 deletions
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index 0bfd4df17d08..75fb556ec01f 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig @@ -12,10 +12,10 @@ config DVB_STV0299 config DVB_CX24110 tristate "Conexant CX24110 based" - depends on DVB_CORE - help + depends on DVB_CORE + help A DVB-S tuner module. Say Y when you want to support this frontend. - + config DVB_TDA8083 tristate "Philips TDA8083 based" depends on DVB_CORE @@ -127,8 +127,8 @@ comment "DVB-C (cable) frontends" config DVB_ATMEL_AT76C651 tristate "Atmel AT76C651 based" depends on DVB_CORE - help - A DVB-C tuner module. Say Y when you want to support this frontend. + help + A DVB-C tuner module. Say Y when you want to support this frontend. config DVB_VES1820 tristate "VLSI VES1820 based" @@ -158,10 +158,6 @@ config DVB_NXT2002 help An ATSC 8VSB tuner module. Say Y when you want to support this frontend. -config DVB_OR51132 - tristate "OR51132 based (pcHDTV)" - depends on DVB_CORE - config DVB_OR51211 tristate "or51211 based (pcHDTV HD2000 card)" depends on DVB_CORE @@ -169,4 +165,12 @@ config DVB_OR51211 help An ATSC 8VSB tuner module. Say Y when you want to support this frontend. +config DVB_OR51132 + tristate "OR51132 based (pcHDTV HD3000 card)" + depends on DVB_CORE + select FW_LOADER + help + An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want + to support this frontend. + endmenu diff --git a/drivers/media/dvb/frontends/mt352.h b/drivers/media/dvb/frontends/mt352.h index 8bc032f7f5c1..03040cd595bb 100644 --- a/drivers/media/dvb/frontends/mt352.h +++ b/drivers/media/dvb/frontends/mt352.h @@ -63,9 +63,3 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config, extern int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen); #endif // MT352_H - -/* - * Local variables: - * c-basic-offset: 8 - * End: - */ diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c index 8805b0f5f619..35a1d60f1927 100644 --- a/drivers/media/dvb/frontends/nxt2002.c +++ b/drivers/media/dvb/frontends/nxt2002.c @@ -343,8 +343,6 @@ static int nxt2002_setup_frontend_parameters (struct dvb_frontend* fe, /* reset the agc now that tuning has been completed */ nxt2002_agc_reset(state); - - /* set target power level */ switch (p->u.vsb.modulation) { case QAM_64: diff --git a/drivers/media/dvb/frontends/tda80xx.c b/drivers/media/dvb/frontends/tda80xx.c index 00c145521f4f..032d348dafb7 100644 --- a/drivers/media/dvb/frontends/tda80xx.c +++ b/drivers/media/dvb/frontends/tda80xx.c @@ -27,7 +27,7 @@ #include <linux/spinlock.h> #include <linux/threads.h> #include <linux/interrupt.h> -#include <asm/irq.h> +#include <linux/irq.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h> |