From: Andrew Morton <akpm@osdl.org>

drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl':
drivers/video/matrox/matroxfb_base.c:1140: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function)
drivers/video/matrox/matroxfb_base.c:1140: error: (Each undeclared identifier is reported only once                                                             drivers/video/matrox/matroxfb_base.c:1140: error: for each function it appears in.)

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/video/matrox/matroxfb_base.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/video/matrox/matroxfb_base.c~git-dvb-versus-matroxfb drivers/video/matrox/matroxfb_base.c
--- a/drivers/video/matrox/matroxfb_base.c~git-dvb-versus-matroxfb
+++ a/drivers/video/matrox/matroxfb_base.c
@@ -102,6 +102,8 @@
 #include <linux/config.h>
 #include <linux/version.h>
 
+#define __OLD_VIDIOC_
+
 #include "matroxfb_base.h"
 #include "matroxfb_misc.h"
 #include "matroxfb_accel.h"
_