Skip to content

Commit c837c93

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (7751): ir-kbd-i2c: Save a temporary memory allocation in ir_probe V4L/DVB (7750): au0828/ cleanups and fixes V4L/DVB (7748): tuner-core: some adjustments at tuner logs, if debug enabled V4L/DVB (7746): pvrusb2: make signed one-bit bitfields unsigned V4L/DVB (7744): pvrusb2-dvb: add atsc/qam support for Hauppauge pvrusb2 model 751xx V4L/DVB (7742): cx88: Add support for the DViCO FusionHDTV_7_GOLD digital modes V4L/DVB (7741): s5h1411: Adding support for this ATSC/QAM demodulator V4L/DVB (7740): tuner-xc2028.c dubious !x & y V4L/DVB (7739): mt312.h: dubious one-bit signed bitfield V4L/DVB (7735): Fix compilation for au0828 V4L/DVB (7734): em28xx: copy and paste error in em28xx_init_isoc V4L/DVB (7733): blackbird_find_mailbox negative return ignored in blackbird_initialize_codec() V4L/DVB (7732): vivi: fix a warning
2 parents d485cb9 + 37c45df commit c837c93

23 files changed

+1135
-109
lines changed

drivers/media/dvb/frontends/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,14 @@ config DVB_AU8522
307307
An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
308308
to support this frontend.
309309

310+
config DVB_S5H1411
311+
tristate "Samsung S5H1411 based"
312+
depends on DVB_CORE && I2C
313+
default m if DVB_FE_CUSTOMISE
314+
help
315+
An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
316+
to support this frontend.
317+
310318
comment "Tuners/PLL support"
311319
depends on DVB_CORE
312320

drivers/media/dvb/frontends/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ obj-$(CONFIG_DVB_TUNER_XC5000) += xc5000.o
5555
obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o
5656
obj-$(CONFIG_DVB_AU8522) += au8522.o
5757
obj-$(CONFIG_DVB_TDA10048) += tda10048.o
58+
obj-$(CONFIG_DVB_S5H1411) += s5h1411.o

drivers/media/dvb/frontends/mt312.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct mt312_config {
3333
u8 demod_address;
3434

3535
/* inverted voltage setting */
36-
int voltage_inverted:1;
36+
unsigned int voltage_inverted:1;
3737
};
3838

3939
#if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE))

0 commit comments

Comments
 (0)