summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 13:03:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 13:57:50 -0700
commit2f1807102a3a5c9b9782b6e8d271fc8ccef91f0a (patch)
treeb5dc428977c9d9baa5df5b0fb3654ab1536d65a6 /drivers/media/video/saa7134/saa7134.h
parente52e98a7eccfb0e7e91630d01690fb11d77db77d (diff)
downloadblackbird-op-linux-2f1807102a3a5c9b9782b6e8d271fc8ccef91f0a.tar.gz
blackbird-op-linux-2f1807102a3a5c9b9782b6e8d271fc8ccef91f0a.zip
[PATCH] v4l: SAA7134 updates and board additions
- Remove $Id CVS logs for V4L files - linux/version.h replaced by linux/utsname.h - Add new Digimatrix card and LG TAPC Mini tuner for it Signed-off-by: Hermann Pitton <hermann.pitton@onlinehome.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r--drivers/media/video/saa7134/saa7134.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 2af0cb2a731b..7a7fa42e1d22 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,4 @@
/*
- * $Id: saa7134.h,v 1.49 2005/07/13 17:25:25 mchehab Exp $
*
* v4l2 device driver for philips saa7134 based TV cards
*
@@ -20,7 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/version.h>
+#include <linux/utsname.h>
#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14)
#include <linux/pci.h>
@@ -185,6 +184,7 @@ struct saa7134_format {
#define SAA7134_BOARD_PHILIPS_TOUGH 61
#define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62
#define SAA7134_BOARD_KWORLD_XPERT 63
+#define SAA7134_BOARD_FLYTV_DIGIMATRIX 64
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8
OpenPOWER on IntegriCloud