---

yaml --- r: 241976 b: refs/heads/master c: d4c9adb h: refs/heads/master v: v3
git-mirror · Mar 21, 2011 · 25ec900 · 25ec900
1 parent e52b7c2
commit 25ec900
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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;