diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 18:31:10 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 18:31:10 -0500 |
| commit | 21e2379b9ef705fcb3ba3be738decd3397fc30b7 (patch) | |
| tree | 6e4f5334547aa538150fe52b60bfe014425eb53b /include/media/v4l2-common.h | |
| parent | d04ae27bae42bcce1b3fa70ca2edf25d92b1cf39 (diff) | |
| parent | 366cc64b0d9ac922ac4f0f54e06c13ec95249928 (diff) | |
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 c74052abb189..d4030a7e16e0 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h | |||
| @@ -120,6 +120,13 @@ enum v4l2_chip_ident { | |||
| 120 | /* select from TV,radio,extern,MUTE */ | 120 | /* select from TV,radio,extern,MUTE */ |
| 121 | #define AUDC_SET_INPUT _IOW('d',89,int) | 121 | #define AUDC_SET_INPUT _IOW('d',89,int) |
| 122 | 122 | ||
| 123 | /* msp3400 ioctl: will be removed in the near future */ | ||
| 124 | struct msp_matrix { | ||
| 125 | int input; | ||
| 126 | int output; | ||
| 127 | }; | ||
| 128 | #define MSP_SET_MATRIX _IOW('m',17,struct msp_matrix) | ||
| 129 | |||
| 123 | /* tuner ioctls */ | 130 | /* tuner ioctls */ |
| 124 | /* Sets tuner type and its I2C addr */ | 131 | /* Sets tuner type and its I2C addr */ |
| 125 | #define TUNER_SET_TYPE_ADDR _IOW('d',90,int) | 132 | #define TUNER_SET_TYPE_ADDR _IOW('d',90,int) |