summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-driver.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-12 17:00:39 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-12 17:00:39 -0200
commitf682a75b2d9c7e3ce33cd5ae0e9772ef8aed5829 (patch)
tree6b58a7849393bb58ecac7f27ac30e772a102a183 /linux/drivers/media/video/ivtv/ivtv-driver.c
parentfaec69843e003fb347d73ca72159b7c892eed687 (diff)
parent25af523c4d1d4d91869b3d1caf4fe72a251d1e33 (diff)
downloadmediapointer-dvb-s2-f682a75b2d9c7e3ce33cd5ae0e9772ef8aed5829.tar.gz
mediapointer-dvb-s2-f682a75b2d9c7e3ce33cd5ae0e9772ef8aed5829.tar.bz2
merge: http://www.linuxtv.org/hg/~stoth/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.c')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-driver.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c
index 85dd27e4b..e7741a031 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.c
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.c
@@ -1077,10 +1077,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
ivtv_process_eeprom(itv);
}
- /* The mspx4xx chips need a longer delay for some reason */
- if (!(itv->hw_flags & IVTV_HW_MSP34XX))
- itv->i2c_algo.udelay = 5;
-
if (itv->std == 0) {
itv->std = V4L2_STD_NTSC_M;
}