Commit ab8e8235 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:
  V4L/DVB (4712): Fix warning when compiling on x86_i64
  V4L/DVB (4711): Radio: No need to return void
  V4L/DVB (4708): Add tveeprom support for Philips FM1236/FM1216ME MK5
  V4L/DVB (4707): 4linux: complete conversion to hotplug safe PCI API
  V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionally
  V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixup
  V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM board
  V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybrid
  V4L/DVB (4701): Saa713x audio fixes
  V4L/DVB (4676a): Remove Kconfig item for DiB7000M support
parents 4d5e392c e1634208

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -98,3 +98,4 @@ 
 97 -> LifeView FlyDVB-S /Acorp TV134DS         [5168:0300,4e42:0300]

 98 -> Proteus Pro 2309                         [0919:2003]

 99 -> AVerMedia TV Hybrid A16AR                [1461:2c00]

100 -> Asus Europa2 OEM                         [1043:4860]

drivers/media/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ config VIDEO_V4L1_COMPAT 


config VIDEO_V4L2

	bool

	depends on VIDEO_DEV

	default y



source "drivers/media/video/Kconfig"

drivers/media/dvb/dvb-usb/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ config DVB_USB_DIBUSB_MC 
config DVB_USB_DIB0700

	tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"

	depends on DVB_USB

	select DVB_DIB7000M

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	help

drivers/media/dvb/dvb-usb/usb-urb.c

+3 −2
Original line number Diff line number Diff line
@@ -122,8 +122,9 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num, 
			usb_free_stream_buffers(stream);

			return -ENOMEM;

		}

		deb_mem("buffer %d: %p (dma: %u)\n",

			stream->buf_num, stream->buf_list[stream->buf_num], stream->dma_addr[stream->buf_num]);

		deb_mem("buffer %d: %p (dma: %Lu)\n",

			stream->buf_num,

stream->buf_list[stream->buf_num], (long long)stream->dma_addr[stream->buf_num]);

		memset(stream->buf_list[stream->buf_num],0,size);

		stream->state |= USB_STATE_URB_BUF;

	}

drivers/media/radio/radio-gemtek-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int __init gemtek_pci_init_module( void ) 


static void __exit gemtek_pci_cleanup_module( void )

{

	return pci_unregister_driver( &gemtek_pci_driver );

	pci_unregister_driver(&gemtek_pci_driver);

}



MODULE_AUTHOR( "Vladimir Shebordaev <vshebordaev@mail.ru>" );

CRA Git | Maintained and supported by SUSTech CRA and CCSE