Merge commit 'v2.6.28-rc9' into x86/apic

[sfrench/cifs-2.6.git] / drivers / media / video / compat_ioctl32.c

diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index bd5d9de5a008eacfc6b493e5813d49d3fd668a57..e6ca4012b5f0f78fab90212e546aa1b6f0cd4946 100644 (file)
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -867,6 +867,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
        case VIDIOC_STREAMON32:
        case VIDIOC_STREAMOFF32:
        case VIDIOC_G_PARM:
+       case VIDIOC_S_PARM:
        case VIDIOC_G_STD:
        case VIDIOC_S_STD:
        case VIDIOC_G_TUNER:
@@ -885,6 +886,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
        case VIDIOC_S_INPUT32:
        case VIDIOC_TRY_FMT32:
        case VIDIOC_S_HW_FREQ_SEEK:
+       case VIDIOC_ENUM_FRAMESIZES:
+       case VIDIOC_ENUM_FRAMEINTERVALS:
                ret = do_video_ioctl(file, cmd, arg);
                break;