diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 21:31:10 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 21:31:10 -0200 |
| commit | 21e2379b9ef705fcb3ba3be738decd3397fc30b7 (patch) | |
| tree | 6e4f5334547aa538150fe52b60bfe014425eb53b /include/media/v4l2-common.h | |
| parent | d04ae27bae42bcce1b3fa70ca2edf25d92b1cf39 (diff) | |
| parent | 366cc64b0d9ac922ac4f0f54e06c13ec95249928 (diff) | |
| download | kernel-crypto-21e2379b9ef705fcb3ba3be738decd3397fc30b7.tar.gz kernel-crypto-21e2379b9ef705fcb3ba3be738decd3397fc30b7.tar.xz kernel-crypto-21e2379b9ef705fcb3ba3be738decd3397fc30b7.zip | |
Merge branch 'work'
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) |