diff options
author | rmcc@localhost.localdomain <rmcc@localhost.localdomain> | 2006-05-18 16:06:06 +0100 |
---|---|---|
committer | rmcc@localhost.localdomain <rmcc@localhost.localdomain> | 2006-05-18 16:06:06 +0100 |
commit | aad2e973e44590acd4c1b55dd32eadad842e7fdb (patch) | |
tree | de152190bd763eb849cf2952cfb468169f3881ba /linux/drivers/media/video/bt8xx/bttvp.h | |
parent | f637ab4e875bd28b68bbd4d776c2071683050b5c (diff) | |
parent | 122bd90fa6f72e1366146662e7fb9a6581aab68e (diff) | |
download | mediapointer-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/bttvp.h')
-rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index a6fa1511a..70158aa5f 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -1,5 +1,4 @@ /* - $Id: bttvp.h,v 1.32 2006/01/15 09:35:15 mchehab Exp $ bttv - Bt848 frame grabber driver |