From 25ec900581dff7a6a4638c4d4b6672446a7b1179 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 1 Mar 2011 08:17:47 -0300
Subject: [PATCH] --- yaml --- r: 241976 b: refs/heads/master c:
 d4c9adb742abd1e8025b6f2e3bb24e3efab86da9 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/video/matrox/matroxfb_base.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 356890f6d874..83a0cf2d1df1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b149bbe9156d2eb2afd5a072bd61ad0d4bfaca7
+refs/heads/master: d4c9adb742abd1e8025b6f2e3bb24e3efab86da9
diff --git a/trunk/drivers/video/matrox/matroxfb_base.c b/trunk/drivers/video/matrox/matroxfb_base.c
index a082debe824b..8c9dbac9dc1b 100644
--- a/trunk/drivers/video/matrox/matroxfb_base.c
+++ b/trunk/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;