diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 09:14:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 09:14:54 -0300 |
| commit | 3590a589476f8094edb2a807adaa699215c2d5ee (patch) | |
| tree | c3948f8afa605f7810666ccdf60ca5b7b6cda406 /linux/include/media/v4l2-dev.h | |
| parent | 53cd728fba53912604889bec57b74645ac73365c (diff) | |
| parent | de70eb5e79c86c8efc2c0568c70f44bf0752c336 (diff) | |
| download | mediapointer-dvb-s2-3590a589476f8094edb2a807adaa699215c2d5ee.tar.gz mediapointer-dvb-s2-3590a589476f8094edb2a807adaa699215c2d5ee.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-videodev
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/v4l2-dev.h')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 2f6c36309..4e1511b0b 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -57,10 +57,9 @@ struct video_device /* device info */ char name[32]; - int type; /* v4l1 */ - int type2; /* v4l2 */ + int vfl_type; int minor; - /* attribute to diferentiate multiple indexs on one physical device */ + /* attribute to differentiate multiple indices on one physical device */ int index; int debug; /* Activates debug level*/ @@ -83,7 +82,7 @@ struct video_device void *priv; #endif - /* for videodev.c intenal usage -- please don't touch */ + /* for videodev.c internal usage -- please don't touch */ int users; /* video_exclusive_{open|close} ... */ struct mutex lock; /* ... helper function uses these */ }; |