tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Johannes Stezenbach and committed by
Linus Torvalds 0b3f5a57 d91b730d

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