From bba15ec1fb8e8d00a1070c3d05b6a28643203b2b Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Tue, 8 Nov 2005 21:37:16 -0800
Subject: [PATCH] --- yaml --- r: 13339 b: refs/heads/master c:
 1f6173ed9b48709383631e2c43eed770f15d05d1 h: refs/heads/master i:   13337:
 7387707d7962ad130b9cfe1ece36ba949dd6a172   13335:
 69d9a8eb1428a2b1f5bcbd9265b90455e58095a3 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 4 ++--
 trunk/drivers/media/video/em28xx/em28xx-core.c  | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-video.c | 2 +-
 trunk/drivers/media/video/tveeprom.c            | 2 +-
 trunk/drivers/media/video/tvp5150.c             | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 37d275d56d2c..2a5dfe1f44a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 376f269e4731a90db41683cb72717e217d3774f5
+refs/heads/master: 1f6173ed9b48709383631e2c43eed770f15d05d1
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index b6d89decfbd8..7333bbad8871 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -29,8 +29,8 @@
 #include <linux/i2c.h>
 #include <linux/usb.h>
 #include <media/tuner.h>
-#include "audiochip.h"
-#include "tveeprom.h"
+#include <media/audiochip.h>
+#include <media/tveeprom.h>
 #include "msp3400.h"
 
 #include "em2820.h"
diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c
index a75a91da70e9..7913740e6724 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-core.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-core.c
@@ -26,9 +26,9 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/videodev.h>
 #include <linux/usb.h>
 #include <linux/vmalloc.h>
+#include <linux/videodev.h>
 
 #include "em2820.h"
 
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index a000131a8f5d..3fc58c67e6cf 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -27,8 +27,8 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/usb.h>
-#include <linux/videodev.h>
 #include <linux/i2c.h>
+#include <linux/videodev.h>
 #include <media/tuner.h>
 #include <linux/video_decoder.h>
 
diff --git a/trunk/drivers/media/video/tveeprom.c b/trunk/drivers/media/video/tveeprom.c
index a9bad89b4d69..ee605712bf19 100644
--- a/trunk/drivers/media/video/tveeprom.c
+++ b/trunk/drivers/media/video/tveeprom.c
@@ -40,7 +40,7 @@
 
 #include <media/tuner.h>
 #include <media/tveeprom.h>
-#include "audiochip.h"
+#include <media/audiochip.h>
 
 MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
 MODULE_AUTHOR("John Klar");
diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c
index 03f360b45fdf..81e6d4494e7d 100644
--- a/trunk/drivers/media/video/tvp5150.c
+++ b/trunk/drivers/media/video/tvp5150.c
@@ -5,7 +5,6 @@
  * This code is placed under the terms of the GNU General Public License
  */
 
-#include <linux/videodev.h>
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <linux/delay.h>