summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-08 21:38:36 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:29 -0800
commitad07d93ae7884a72a293eb4efb61a872f109ebd5 (patch)
treed519e95b55af9b93b5460a821984f16a7a057d66
parent6cffcc23d2837295604033d884d1ad259d0aed57 (diff)
downloadblackbird-op-linux-ad07d93ae7884a72a293eb4efb61a872f109ebd5.tar.gz
blackbird-op-linux-ad07d93ae7884a72a293eb4efb61a872f109ebd5.zip
[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>
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c1
-rw-r--r--include/media/saa7146_vv.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index f6acce820791..5b09f52dd669 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 f3aa24f8131c..64691753721e 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>
OpenPOWER on IntegriCloud