diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:20:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:20:01 -0800 |
| commit | d669af9d5afb5bdb629f78d024b35e507465f570 (patch) | |
| tree | 711ab23d69098fa05973b69efbd0ae61cc7ff927 /drivers/media/video/v4l2-common.c | |
| parent | 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d (diff) | |
| parent | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (diff) | |
| download | op-kernel-dev-d669af9d5afb5bdb629f78d024b35e507465f570.zip op-kernel-dev-d669af9d5afb5bdb629f78d024b35e507465f570.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
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 5dbd7c1..cd2c447 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[] = { #endif [_IOC_NR(AUDC_SET_RADIO)] = "AUDC_SET_RADIO", [_IOC_NR(AUDC_SET_INPUT)] = "AUDC_SET_INPUT", + [_IOC_NR(MSP_SET_MATRIX)] = "MSP_SET_MATRIX", [_IOC_NR(TUNER_SET_TYPE_ADDR)] = "TUNER_SET_TYPE_ADDR", [_IOC_NR(TUNER_SET_STANDBY)] = "TUNER_SET_STANDBY", |
