summaryrefslogtreecommitdiff
path: root/drivers/media/video/tvmixer.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>2005-06-27 01:20:36 +0400
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-06-27 01:20:36 +0400
commit7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch)
tree82d934ebf07f22a2c64c3b6d82ec24082878b43a /drivers/media/video/tvmixer.c
parentf1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (diff)
parent7d681b23d6cc14a8c026ea6756242cb522cbbcae (diff)
downloadlinux-7ca6448dbfb398bba36eda3c01bc14b86c3675be.tar.xz
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to 'drivers/media/video/tvmixer.c')
-rw-r--r--drivers/media/video/tvmixer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index eafd7061b310..51b99cdbf29e 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -1,3 +1,7 @@
+/*
+ * $Id: tvmixer.c,v 1.8 2005/06/12 04:19:19 mchehab Exp $
+ */
+
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>