---

yaml --- r: 13435 b: refs/heads/master c: ad07d93 h: refs/heads/master i: 13433: 1b91ccf 13431: 5555d11 v: v3
git-mirror · Nov 9, 2005 · 9adaee2 · 9adaee2
1 parent 6b632bf
commit 9adaee2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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>