Merge branch 'linus' into x86/gart

[linux-2.6-omap-h63xx.git] / drivers / media / video / compat_ioctl32.c

diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index f065ad12cc6119c3ca69db39d74e74ff827a612d..cefd1381e8de89eba2e75bb7056b27720e5afda0 100644 (file)
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -848,6 +848,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
        case VIDIOCSFREQ32:
        case VIDIOCGAUDIO:
        case VIDIOCSAUDIO:
+       case VIDIOCGVBIFMT:
+       case VIDIOCSVBIFMT:
 #endif
        case VIDIOC_QUERYCAP:
        case VIDIOC_ENUM_FMT:
@@ -874,7 +876,10 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
        case VIDIOC_ENUMINPUT:
        case VIDIOC_ENUMINPUT32:
        case VIDIOC_G_CTRL:
+       case VIDIOC_S_CTRL:
        case VIDIOC_S_CTRL32:
+       case VIDIOC_S_FREQUENCY:
+       case VIDIOC_G_FREQUENCY:
        case VIDIOC_QUERYCTRL:
        case VIDIOC_G_INPUT32:
        case VIDIOC_S_INPUT32: