Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (ce4b50f2) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/video4linux/CARDLIST.cx88

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,4 +42,4 @@
	41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802]		41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802]
	42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025]		42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025]
	43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1]		43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1]
	44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50]		44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54]

Documentation/video4linux/CARDLIST.saa7134

+3 −3

MAINTAINERS

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -540,7 +540,8 @@ S: Supported

	BTTV VIDEO4LINUX DRIVER		BTTV VIDEO4LINUX DRIVER
	P: Mauro Carvalho Chehab		P: Mauro Carvalho Chehab
	M: mchehab@brturbo.com.br		M: mchehab@infradead.org
			M: v4l-dvb-maintainer@linuxtv.org
	L: video4linux-list@redhat.com		L: video4linux-list@redhat.com
	W: http://linuxtv.org		W: http://linuxtv.org
	T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git		T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
	@@ -837,11 +838,12 @@ S: Maintained

	DVB SUBSYSTEM AND DRIVERS		DVB SUBSYSTEM AND DRIVERS
	P: LinuxTV.org Project		P: LinuxTV.org Project
	M: linux-dvb-maintainer@linuxtv.org		M: mchehab@infradead.org
			M: v4l-dvb-maintainer@linuxtv.org
	L: linux-dvb@linuxtv.org (subscription required)		L: linux-dvb@linuxtv.org (subscription required)
	W: http://linuxtv.org/		W: http://linuxtv.org/
	T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git		T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
	S: Supported		S: Maintained

	EATA-DMA SCSI DRIVER		EATA-DMA SCSI DRIVER
	P: Michael Neuffer		P: Michael Neuffer
	@@ -2956,7 +2958,8 @@ S: Maintained

	VIDEO FOR LINUX		VIDEO FOR LINUX
	P: Mauro Carvalho Chehab		P: Mauro Carvalho Chehab
	M: mchehab@brturbo.com.br		M: mchehab@infradead.org
			M: v4l-dvb-maintainer@linuxtv.org
	L: video4linux-list@redhat.com		L: video4linux-list@redhat.com
	W: http://linuxtv.org		W: http://linuxtv.org
	T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git		T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

drivers/media/dvb/b2c2/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@ config DVB_B2C2_FLEXCOP
	select DVB_STV0299		select DVB_STV0299
	select DVB_MT352		select DVB_MT352
	select DVB_MT312		select DVB_MT312
	select DVB_NXT2002		select DVB_NXT200X
	select DVB_STV0297		select DVB_STV0297
	select DVB_BCM3510		select DVB_BCM3510
	select DVB_LGDT330X		select DVB_LGDT330X

drivers/media/dvb/b2c2/flexcop-common.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -116,11 +116,9 @@ void flexcop_dma_free(struct flexcop_dma *dma);

	int flexcop_dma_control_timer_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);		int flexcop_dma_control_timer_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);
	int flexcop_dma_control_size_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);		int flexcop_dma_control_size_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);
	int flexcop_dma_control_packet_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);
	int flexcop_dma_config(struct flexcop_device fc, struct flexcop_dma dma, flexcop_dma_index_t dma_idx);		int flexcop_dma_config(struct flexcop_device fc, struct flexcop_dma dma, flexcop_dma_index_t dma_idx);
	int flexcop_dma_xfer_control(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, flexcop_dma_addr_index_t index, int onoff);		int flexcop_dma_xfer_control(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, flexcop_dma_addr_index_t index, int onoff);
	int flexcop_dma_config_timer(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 cycles);		int flexcop_dma_config_timer(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 cycles);
	int flexcop_dma_config_packet_count(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 packets);

	/* from flexcop-eeprom.c */		/* from flexcop-eeprom.c */
	/* the PCI part uses this call to get the MAC address, the USB part has its own */		/* the PCI part uses this call to get the MAC address, the USB part has its own */

Original line number	Original line	Diff line number	Diff line
	0 -> UNKNOWN/GENERIC		0 -> UNKNOWN/GENERIC
	1 -> Proteus Pro [philips reference design] [1131:2001,1131:2001]		1 -> Proteus Pro [philips reference design] [1131:2001,1131:2001]
	2 -> LifeView FlyVIDEO3000 [5168:0138,4e42:0138]		2 -> LifeView FlyVIDEO3000 [5168:0138,4e42:0138]
	3 -> LifeView FlyVIDEO2000 [5168:0138]		3 -> LifeView/Typhoon FlyVIDEO2000 [5168:0138,4e42:0138]
	4 -> EMPRESS [1131:6752]		4 -> EMPRESS [1131:6752]
	5 -> SKNet Monster TV [1131:4e85]		5 -> SKNet Monster TV [1131:4e85]
	6 -> Tevion MD 9717		6 -> Tevion MD 9717
	@@ -53,12 +53,12 @@
	52 -> AverMedia AverTV/305 [1461:2108]		52 -> AverMedia AverTV/305 [1461:2108]
	53 -> ASUS TV-FM 7135 [1043:4845]		53 -> ASUS TV-FM 7135 [1043:4845]
	54 -> LifeView FlyTV Platinum FM [5168:0214,1489:0214]		54 -> LifeView FlyTV Platinum FM [5168:0214,1489:0214]
	55 -> LifeView FlyDVB-T DUO [5168:0502,5168:0306]		55 -> LifeView FlyDVB-T DUO [5168:0306]
	56 -> Avermedia AVerTV 307 [1461:a70a]		56 -> Avermedia AVerTV 307 [1461:a70a]
	57 -> Avermedia AVerTV GO 007 FM [1461:f31f]		57 -> Avermedia AVerTV GO 007 FM [1461:f31f]
	58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0351,1421:0370,1421:1370]		58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0351,1421:0370,1421:1370]
	59 -> Kworld/Tevion V-Stream Xpert TV PVR7134		59 -> Kworld/Tevion V-Stream Xpert TV PVR7134
	60 -> Typhoon DVB-T Duo Digital/Analog Cardbus [4e42:0502]		60 -> LifeView/Typhoon FlyDVB-T Duo Cardbus [5168:0502,4e42:0502]
	61 -> Philips TOUGH DVB-T reference design [1131:2004]		61 -> Philips TOUGH DVB-T reference design [1131:2004]
	62 -> Compro VideoMate TV Gold+II		62 -> Compro VideoMate TV Gold+II
	63 -> Kworld Xpert TV PVR7134		63 -> Kworld Xpert TV PVR7134