Commit 7a2fe8c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  Merge branch 'work-fixes'
  V4L/DVB (3413): Typos grab bag of the month
  V4L/DVB (3403): Workaround to fix initialization for Nexus CA
  Merge branch 'work-fixes'
  V4L/DVB (3395): Fixed Pinnacle 300i DVB-T support
  V4L/DVB (3399): ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
  V4L/DVB (3382): Fix stv0297 for qam128 on tt c1500 (saa7146)
  V4L/DVB (3300a): Removing personal email from DVB maintainers
  V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver
  V4L/DVB (3378): Restore power on defaults of tda9887 after tda8290 probe
  V4L/DVB (3354): Fix maximum for the saturation and contrast controls.
  V4L/DVB (3352): Cxusb: fix lgdt3303 naming
  V4L/DVB (3348): Fixed saa7134 ALSA initialization with multiple cards
  V4L/DVB (3347): Pinnacle PCTV 40i: add filtered Composite2 input
  V4L/DVB (3341): Upstream sync - make 2 structs static
  V4L/DVB (3340): Make a struct static
  V4L/DVB (3337): Drivers/media/dvb/frontends/mt312.c: cleanups
  V4L/DVB (3336): Bt8xx documentation authors fix
parents 2ec5e3a8 155ec9e6

Documentation/dvb/bt8xx.txt

+5 −1
Original line number Diff line number Diff line
@@ -111,4 +111,8 @@ source: linux/Documentation/video4linux/CARDLIST.bttv 
If you have problems with this please do ask on the mailing list.



--

Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham
 
Authors: Richard Walker,

	 Jamie Honan,

	 Michael Hunold,

	 Manu Abraham,

	 Michael Krufky

Documentation/video4linux/CARDLIST.saa7134

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 12 -> Medion 7134                              [16be:0003]

 13 -> Typhoon TV+Radio 90031

 14 -> ELSA EX-VISION 300TV                     [1048:226b]

 15 -> ELSA EX-VISION 500TV                     [1048:226b]

 15 -> ELSA EX-VISION 500TV                     [1048:226a]

 16 -> ASUS TV-FM 7134                          [1043:4842,1043:4830,1043:4840]

 17 -> AOPEN VA1000 POWER                       [1131:7133]

 18 -> BMK MPEX No Tuner
@@ -75,7 +75,7 @@ 
 74 -> LifeView FlyTV Platinum Mini2            [14c0:1212]

 75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]

 76 -> SKNet MonsterTV Mobile                   [1131:4ee9]

 77 -> Pinnacle PCTV 110i (saa7133)             [11bd:002e]

 77 -> Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]

 78 -> ASUSTeK P7131 Dual                       [1043:4862]

 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)

 80 -> ASUS Digimatrix TV                       [1043:0210]

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -838,7 +838,6 @@ S: Maintained 


DVB SUBSYSTEM AND DRIVERS

P:	LinuxTV.org Project

M:	mchehab@infradead.org

M:	v4l-dvb-maintainer@linuxtv.org

L: 	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/

drivers/media/dvb/b2c2/flexcop-fe-tuner.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ int flexcop_frontend_init(struct flexcop_device *fc) 
		info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);

	} else

	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */

	if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {

	if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {

		ops = fc->fe->ops;



		ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;

drivers/media/dvb/bt8xx/bt878.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet * 
EXPORT_SYMBOL(bt878_device_control);





struct cards card_list[] __devinitdata = {

static struct cards card_list[] __devinitdata = {



	{ 0x01010071, BTTV_BOARD_NEBULA_DIGITV,			"Nebula Electronics DigiTV" },

	{ 0x07611461, BTTV_BOARD_AVDVBT_761,			"AverMedia AverTV DVB-T 761" },

CRA Git | Maintained and supported by SUSTech CRA and CCSE