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 /drivers/media/video/v4l2-common.c | |
| parent | d04ae27bae42bcce1b3fa70ca2edf25d92b1cf39 (diff) | |
| parent | 366cc64b0d9ac922ac4f0f54e06c13ec95249928 (diff) | |
Merge branch 'work'
Diffstat (limited to 'drivers/media/video/v4l2-common.c')
| -rw-r--r-- | drivers/media/video/v4l2-common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 5dbd7c1b362a..cd2c4475525e 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
| @@ -306,6 +306,7 @@ static const char *v4l2_int_ioctls[] = { | |||
| 306 | #endif | 306 | #endif |
| 307 | [_IOC_NR(AUDC_SET_RADIO)] = "AUDC_SET_RADIO", | 307 | [_IOC_NR(AUDC_SET_RADIO)] = "AUDC_SET_RADIO", |
| 308 | [_IOC_NR(AUDC_SET_INPUT)] = "AUDC_SET_INPUT", | 308 | [_IOC_NR(AUDC_SET_INPUT)] = "AUDC_SET_INPUT", |
| 309 | [_IOC_NR(MSP_SET_MATRIX)] = "MSP_SET_MATRIX", | ||
| 309 | 310 | ||
| 310 | [_IOC_NR(TUNER_SET_TYPE_ADDR)] = "TUNER_SET_TYPE_ADDR", | 311 | [_IOC_NR(TUNER_SET_TYPE_ADDR)] = "TUNER_SET_TYPE_ADDR", |
| 311 | [_IOC_NR(TUNER_SET_STANDBY)] = "TUNER_SET_STANDBY", | 312 | [_IOC_NR(TUNER_SET_STANDBY)] = "TUNER_SET_STANDBY", |