diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-15 17:39:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-15 17:39:01 -0300 |
| commit | 860f43664b728edbd09625faf68b6277e4342969 (patch) | |
| tree | 5cf7fcb86b65b0fe5708b5e17acf015b028fbdbe /linux/include/media | |
| parent | 0bc7aa319880a5596aa90e1a4b27e6b126856998 (diff) | |
| parent | 8680b10925d064efcd02c81c40c48e0c611e6d54 (diff) | |
| download | mediapointer-dvb-s2-860f43664b728edbd09625faf68b6277e4342969.tar.gz mediapointer-dvb-s2-860f43664b728edbd09625faf68b6277e4342969.tar.bz2 | |
Merging mchehab saa7115 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/v4l2-common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index a69118bbc..9ddebdd2a 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -109,6 +109,7 @@ enum v4l2_chip_ident { V4L2_IDENT_UNKNOWN = 0, /* module saa7115: reserved range 100-149 */ + V4L2_IDENT_SAA7113 = 103, V4L2_IDENT_SAA7114 = 104, V4L2_IDENT_SAA7115 = 105, |