summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bt8xx/bttv.h
diff options
context:
space:
mode:
authorrmcc@localhost.localdomain <rmcc@localhost.localdomain>2006-05-18 16:06:06 +0100
committerrmcc@localhost.localdomain <rmcc@localhost.localdomain>2006-05-18 16:06:06 +0100
commitaad2e973e44590acd4c1b55dd32eadad842e7fdb (patch)
treede152190bd763eb849cf2952cfb468169f3881ba /linux/drivers/media/video/bt8xx/bttv.h
parentf637ab4e875bd28b68bbd4d776c2071683050b5c (diff)
parent122bd90fa6f72e1366146662e7fb9a6581aab68e (diff)
downloadmediapointer-dvb-s2-aad2e973e44590acd4c1b55dd32eadad842e7fdb.tar.gz
mediapointer-dvb-s2-aad2e973e44590acd4c1b55dd32eadad842e7fdb.tar.bz2
merge: from master
From: Ricardo Cerqueira <v4l@cerqueira.org> merging master changes Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv.h')
-rw-r--r--linux/drivers/media/video/bt8xx/bttv.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h
index 563b4fb61..88b72b8a3 100644
--- a/linux/drivers/media/video/bt8xx/bttv.h
+++ b/linux/drivers/media/video/bt8xx/bttv.h
@@ -1,5 +1,4 @@
/*
- * $Id: bttv.h,v 1.38 2006/01/15 23:19:19 mchehab Exp $
*
* bttv - Bt848 frame grabber driver
*