Commit 7366935a 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 (4608c): Fix I2C dependencies for saa7146 modules
  V4L/DVB (4608b): i2c deps fix on DVB
  V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install
  V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900.
  V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality
  V4L/DVB (4494a): Fix compilation when V4L1 support is not present
parents 3ee4b889 e7ea8fc2

drivers/media/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ config VIDEO_V4L1_COMPAT 
	  If you are unsure as to whether this is required, answer Y.



config VIDEO_V4L2

	tristate

	bool

	default y



source "drivers/media/video/Kconfig"

drivers/media/common/saa7146_video.c

+2 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int 
		}

		return err;

	}

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	case VIDIOCGMBUF:

	{

		struct video_mbuf *mbuf = arg;
@@ -1218,6 +1219,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int 
		mutex_unlock(&q->lock);

		return 0;

	}

#endif

	default:

		return v4l_compat_translate_ioctl(inode,file,cmd,arg,

						  saa7146_video_do_ioctl);

drivers/media/dvb/b2c2/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DVB_B2C2_FLEXCOP

	tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"

	depends on DVB_CORE && I2C

	select DVB_PLL

	select DVB_STV0299

	select DVB_MT352

	select DVB_MT312

drivers/media/dvb/bt8xx/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DVB_BT8XX

	tristate "BT8xx based PCI cards"

	depends on DVB_CORE && PCI && I2C && VIDEO_BT848

	select DVB_PLL

	select DVB_MT352

	select DVB_SP887X

	select DVB_NXT6000

drivers/media/dvb/dvb-usb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config DVB_USB 
	tristate "Support for various USB DVB devices"

	depends on DVB_CORE && USB && I2C

	select FW_LOADER

	select DVB_PLL

	help

	  By enabling this you will be able to choose the various supported

	  USB1.1 and USB2.0 DVB devices.

CRA Git | Maintained and supported by SUSTech CRA and CCSE