From e63df8330a4804eb746a91622cfa32ba38947807 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Fri, 22 Jul 2005 04:09:41 +0000 Subject: * scripts/merge-trees.sh: - New script to symlink DVB frontend code from dvb-kernel cvs tree into patched video4linux cvs tree for testing and development across both trees. * scripts/unmerge-trees.sh: - New script to be run after development, and before generating patches or making cvs commits. This removes the symlinks to the frontend code, and reverts the patch to the video4linux tree created by merge-trees.sh . Signed-off-by: Michael Krufky --- linux/drivers/media/video/saa7134/saa7134-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index 79df39b0f..05bdc8b8f 100644 --- a/linux/drivers/media/video/saa7134/saa7134-i2c.c +++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-i2c.c,v 1.21 2005/07/21 21:12:02 hhackmann Exp $ + * $Id: saa7134-i2c.c,v 1.22 2005/07/22 04:09:41 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * i2c interface support @@ -306,8 +306,8 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, status = i2c_get_status(dev); if (i2c_is_error(status)) goto err; - /* ensure that the bus is idle for at least one bit slot */ - msleep(1); + /* ensure that the bus is idle for at least one bit slot */ + msleep(1); d1printk("\n"); return num; -- cgit v1.2.3