From 9adaee2ef9d0e181f26c1dc35759771eb6f66a61 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Tue, 8 Nov 2005 21:38:36 -0800
Subject: [PATCH] --- yaml --- r: 13435 b: refs/heads/master c:
 ad07d93ae7884a72a293eb4efb61a872f109ebd5 h: refs/heads/master i:   13433:
 1b91ccf792f06f297d6c5f49b8ddc3a3735aa2db   13431:
 5555d117ccc5579f8b74595f95fea9a6a21581f4 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-video.c | 1 -
 trunk/include/media/saa7146_vv.h                | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 997e97efb1ea..5a00059b7f0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cffcc23d2837295604033d884d1ad259d0aed57
+refs/heads/master: ad07d93ae7884a72a293eb4efb61a872f109ebd5
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index f6acce820791..5b09f52dd669 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -28,7 +28,6 @@
 #include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/video_decoder.h>
-#include <linux/utsname.h>
 
 #include "em28xx.h"
 #include <media/tuner.h>
diff --git a/trunk/include/media/saa7146_vv.h b/trunk/include/media/saa7146_vv.h
index f3aa24f8131c..64691753721e 100644
--- a/trunk/include/media/saa7146_vv.h
+++ b/trunk/include/media/saa7146_vv.h
@@ -1,7 +1,7 @@
 #ifndef __SAA7146_VV__
 #define __SAA7146_VV__
 
-#include <linux/videodev2.h>
+#include <linux/videodev.h>
 
 #include <media/saa7146.h>
 #include <media/video-buf.h>