aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/Kconfig22
-rw-r--r--drivers/media/dvb/frontends/mt352.h6
-rw-r--r--drivers/media/dvb/frontends/nxt2002.c2
-rw-r--r--drivers/media/dvb/frontends/tda80xx.c2
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
12 12
13config DVB_CX24110 13config DVB_CX24110
14 tristate "Conexant CX24110 based" 14 tristate "Conexant CX24110 based"
15 depends on DVB_CORE 15 depends on DVB_CORE
16 help 16 help
17 A DVB-S tuner module. Say Y when you want to support this frontend. 17 A DVB-S tuner module. Say Y when you want to support this frontend.
18 18
19config DVB_TDA8083 19config DVB_TDA8083
20 tristate "Philips TDA8083 based" 20 tristate "Philips TDA8083 based"
21 depends on DVB_CORE 21 depends on DVB_CORE
@@ -127,8 +127,8 @@ comment "DVB-C (cable) frontends"
127config DVB_ATMEL_AT76C651 127config DVB_ATMEL_AT76C651
128 tristate "Atmel AT76C651 based" 128 tristate "Atmel AT76C651 based"
129 depends on DVB_CORE 129 depends on DVB_CORE
130 help 130 help
131 A DVB-C tuner module. Say Y when you want to support this frontend. 131 A DVB-C tuner module. Say Y when you want to support this frontend.
132 132
133config DVB_VES1820 133config DVB_VES1820
134 tristate "VLSI VES1820 based" 134 tristate "VLSI VES1820 based"
@@ -158,10 +158,6 @@ config DVB_NXT2002
158 help 158 help
159 An ATSC 8VSB tuner module. Say Y when you want to support this frontend. 159 An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
160 160
161config DVB_OR51132
162 tristate "OR51132 based (pcHDTV)"
163 depends on DVB_CORE
164
165config DVB_OR51211 161config DVB_OR51211
166 tristate "or51211 based (pcHDTV HD2000 card)" 162 tristate "or51211 based (pcHDTV HD2000 card)"
167 depends on DVB_CORE 163 depends on DVB_CORE
@@ -169,4 +165,12 @@ config DVB_OR51211
169 help 165 help
170 An ATSC 8VSB tuner module. Say Y when you want to support this frontend. 166 An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
171 167
168config DVB_OR51132
169 tristate "OR51132 based (pcHDTV HD3000 card)"
170 depends on DVB_CORE
171 select FW_LOADER
172 help
173 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
174 to support this frontend.
175
172endmenu 176endmenu
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,
63extern int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen); 63extern int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen);
64 64
65#endif // MT352_H 65#endif // MT352_H
66
67/*
68 * Local variables:
69 * c-basic-offset: 8
70 * End:
71 */
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,
343 /* reset the agc now that tuning has been completed */ 343 /* reset the agc now that tuning has been completed */
344 nxt2002_agc_reset(state); 344 nxt2002_agc_reset(state);
345 345
346
347
348 /* set target power level */ 346 /* set target power level */
349 switch (p->u.vsb.modulation) { 347 switch (p->u.vsb.modulation) {
350 case QAM_64: 348 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 @@
27#include <linux/spinlock.h> 27#include <linux/spinlock.h>
28#include <linux/threads.h> 28#include <linux/threads.h>
29#include <linux/interrupt.h> 29#include <linux/interrupt.h>
30#include <asm/irq.h> 30#include <linux/irq.h>
31#include <linux/kernel.h> 31#include <linux/kernel.h>
32#include <linux/module.h> 32#include <linux/module.h>
33#include <linux/slab.h> 33#include <linux/slab.h>