diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 08:39:30 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 08:39:30 -0200 |
| commit | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (patch) | |
| tree | d6e3f7e8ac8a6c567d800fb30e237eb788ac3edf /include/media/v4l2-common.h | |
| parent | 4a8e4a270b89030bdeb09d2f8cef7cfe9a50e54d (diff) | |
| parent | 21e2379b9ef705fcb3ba3be738decd3397fc30b7 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'include/media/v4l2-common.h')
| -rw-r--r-- | include/media/v4l2-common.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index c74052abb18..d4030a7e16e 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -120,6 +120,13 @@ enum v4l2_chip_ident { /* select from TV,radio,extern,MUTE */ #define AUDC_SET_INPUT _IOW('d',89,int) +/* msp3400 ioctl: will be removed in the near future */ +struct msp_matrix { + int input; + int output; +}; +#define MSP_SET_MATRIX _IOW('m',17,struct msp_matrix) + /* tuner ioctls */ /* Sets tuner type and its I2C addr */ #define TUNER_SET_TYPE_ADDR _IOW('d',90,int) |