From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 1 Mar 2011 11:17:47 +0000 (-0300)
Subject: matrox: Remove legacy VIDIOC_*_OLD ioctls
X-Git-Tag: v2.6.39-rc1~86^2~213
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d4c9adb742abd1e8025b6f2e3bb24e3efab86da9;p=~shefty%2Frdma-dev.git

matrox: Remove legacy VIDIOC_*_OLD ioctls

Those ioctls were produced by the wrong arguments for _IO macros,
and were replaced by fixed versions on an early 2.6 kernel.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index a082debe824..8c9dbac9dc1 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -101,8 +101,6 @@
 
 #include <linux/version.h>
 
-#define __OLD_VIDIOC_
-
 #include "matroxfb_base.h"
 #include "matroxfb_misc.h"
 #include "matroxfb_accel.h"
@@ -1152,7 +1150,6 @@ static int matroxfb_ioctl(struct fb_info *info,
 					return -EFAULT;
 				return err;
 			}
-		case VIDIOC_S_CTRL_OLD:
 		case VIDIOC_S_CTRL:
 			{
 				struct v4l2_control ctrl;