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 (6876): ivtv: mspx4xx needs a longer i2c udelay
  V4L/DVB (6871): Kconfig: VIDEO_CX23885 must select DVB_LGDT330X

drivers/media/video/cx23885/Kconfig

@@ -10,6 +10,7 @@ config VIDEO_CX23885
 	select VIDEOBUF_DVB
 	select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE
 	select DVB_S5H1409 if !DVB_FE_CUSTOMISE
+	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
 	select DVB_PLL if !DVB_FE_CUSTOMISE
 	---help---
 	  This is a video4linux driver for Conexant 23885 based

drivers/media/video/ivtv/ivtv-i2c.c

@@ -718,6 +718,9 @@ int init_ivtv_i2c(struct ivtv *itv)
 		       sizeof(struct i2c_adapter));
 		memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template,
 		       sizeof(struct i2c_algo_bit_data));
+		/* The mspx4xx chips need a longer delay for some reason */
+		if (itv->hw_flags & IVTV_HW_MSP34XX)
+			itv->i2c_algo.udelay = 10;
 		itv->i2c_algo.data = itv;
 		itv->i2c_adap.algo_data = &itv->i2c_algo;
 	}