aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-03-01 06:17:47 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:38 -0400
commitd4c9adb742abd1e8025b6f2e3bb24e3efab86da9 (patch)
tree259543bab430cd621f17ca2343b5d8cc4fd13e5b
parent1b149bbe9156d2eb2afd5a072bd61ad0d4bfaca7 (diff)
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>
-rw-r--r--drivers/video/matrox/matroxfb_base.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index a082debe824b..8c9dbac9dc1b 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -101,8 +101,6 @@
101 101
102#include <linux/version.h> 102#include <linux/version.h>
103 103
104#define __OLD_VIDIOC_
105
106#include "matroxfb_base.h" 104#include "matroxfb_base.h"
107#include "matroxfb_misc.h" 105#include "matroxfb_misc.h"
108#include "matroxfb_accel.h" 106#include "matroxfb_accel.h"
@@ -1152,7 +1150,6 @@ static int matroxfb_ioctl(struct fb_info *info,
1152 return -EFAULT; 1150 return -EFAULT;
1153 return err; 1151 return err;
1154 } 1152 }
1155 case VIDIOC_S_CTRL_OLD:
1156 case VIDIOC_S_CTRL: 1153 case VIDIOC_S_CTRL:
1157 { 1154 {
1158 struct v4l2_control ctrl; 1155 struct v4l2_control ctrl;