aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/v4l2-compat-ioctl32.c1
-rw-r--r--drivers/media/video/v4l2-ioctl.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index 110376be5d2..0056b115b42 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -1047,7 +1047,6 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
1047 case VIDIOC_DBG_S_REGISTER: 1047 case VIDIOC_DBG_S_REGISTER:
1048 case VIDIOC_DBG_G_REGISTER: 1048 case VIDIOC_DBG_G_REGISTER:
1049 case VIDIOC_DBG_G_CHIP_IDENT: 1049 case VIDIOC_DBG_G_CHIP_IDENT:
1050 case VIDIOC_G_CHIP_IDENT_OLD:
1051 case VIDIOC_S_HW_FREQ_SEEK: 1050 case VIDIOC_S_HW_FREQ_SEEK:
1052 ret = do_video_ioctl(file, cmd, arg); 1051 ret = do_video_ioctl(file, cmd, arg);
1053 break; 1052 break;
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 583f9c158e6..df8d1ff1a57 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1692,11 +1692,6 @@ static long __video_do_ioctl(struct file *file,
1692 dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision); 1692 dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);
1693 break; 1693 break;
1694 } 1694 }
1695 case VIDIOC_G_CHIP_IDENT_OLD:
1696 printk(KERN_ERR "VIDIOC_G_CHIP_IDENT has been deprecated and will disappear in 2.6.30.\n");
1697 printk(KERN_ERR "It is a debugging ioctl and must not be used in applications!\n");
1698 return -EINVAL;
1699
1700 case VIDIOC_S_HW_FREQ_SEEK: 1695 case VIDIOC_S_HW_FREQ_SEEK:
1701 { 1696 {
1702 struct v4l2_hw_freq_seek *p = arg; 1697 struct v4l2_hw_freq_seek *p = arg;