Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c837c93a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d485cb9a 37c45df7

drivers/media/dvb/frontends/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -307,6 +307,14 @@ config DVB_AU8522 
	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want

	  to support this frontend.



config DVB_S5H1411

	tristate "Samsung S5H1411 based"

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	help

	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want

	  to support this frontend.



comment "Tuners/PLL support"

	depends on DVB_CORE

drivers/media/dvb/frontends/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -55,3 +55,4 @@ obj-$(CONFIG_DVB_TUNER_XC5000) += xc5000.o 
obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o

obj-$(CONFIG_DVB_AU8522) += au8522.o

obj-$(CONFIG_DVB_TDA10048) += tda10048.o

obj-$(CONFIG_DVB_S5H1411) += s5h1411.o

drivers/media/dvb/frontends/mt312.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct mt312_config { 
	u8 demod_address;



	/* inverted voltage setting */

	int voltage_inverted:1;

	unsigned int voltage_inverted:1;

};



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

drivers/media/dvb/frontends/s5h1411.c

0 → 100644
+888 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/media/dvb/frontends/s5h1411.h

0 → 100644
+90 −0

File added.

Preview size limit exceeded, changes collapsed.