From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Wed, 9 Nov 2005 05:38:36 +0000 (-0800)
Subject: [PATCH] v4l: 897: saa7146 fix
X-Git-Tag: v2.6.15-rc1~148
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad07d93ae7884a72a293eb4efb61a872f109ebd5;p=linux-2.6

[PATCH] v4l: 897: saa7146 fix

- Fixing headers to compile cleanly.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index f6acce8207..5b09f52dd6 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/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/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index f3aa24f813..6469175372 100644
--- a/include/media/saa7146_vv.h
+++ b/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>