From a153b824099026a170b76a52a93e2b6a7fc6c4ef Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <devnull@localhost>
Date: Sat, 8 Oct 2005 20:20:09 +0000
Subject:         From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

        * ../linux/drivers/media/video/tveeprom.c:
        - Fixed include when compiling at kernel tree

        * ../linux/include/linux/videodev.h:
        - removed compat.h from wrong place

        * ../linux/drivers/media/video/tvp5150.c:
        * ../linux/kernel/drivers/usb/media/em2820-cards.c:
        * ../linux/kernel/drivers/usb/media/em2820-core.c:
        * ../linux/kernel/drivers/usb/media/em2820-i2c.c:
        * ../linux/kernel/drivers/usb/media/em2820-video.c:
        - included compat.h at the right place

        * ../v4l/Make
        - now creates symlinks to allow compiling V4L stuff at
          v4l dir.

        * ../v4l/scripts/prepare-ChangeLog.pl:
        - modified to include other directories.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---
 linux/drivers/media/video/em28xx/em28xx-cards.c | 5 +++--
 linux/drivers/media/video/em28xx/em28xx-core.c  | 3 ++-
 linux/drivers/media/video/em28xx/em28xx-i2c.c   | 1 +
 linux/drivers/media/video/em28xx/em28xx-video.c | 3 ++-
 linux/drivers/media/video/tveeprom.c            | 2 +-
 linux/drivers/media/video/tvp5150.c             | 1 -
 6 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'linux/drivers/media')

diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index 9955b7dc5..d9014eb89 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -28,9 +28,10 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/usb.h>
+#include "compat.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/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index 2da7ce029..b7beacf23 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c
@@ -26,9 +26,10 @@
 #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 "compat.h"
+#include <linux/videodev.h>
 
 #include "em2820.h"
 
diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c
index 6eada9943..e1506d92b 100644
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <media/tuner.h>
 #include <linux/video_decoder.h>
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index d5edcfe1b..18a8b0039 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -27,8 +27,9 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/usb.h>
-#include <linux/videodev.h>
 #include <linux/i2c.h>
+#include "compat.h"
+#include <linux/videodev.h>
 #include <media/tuner.h>
 #include <linux/video_decoder.h>
 
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index 072a52603..13680675f 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -41,7 +41,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/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c
index c3e468b09..6c43a85b0 100644
--- a/linux/drivers/media/video/tvp5150.c
+++ b/linux/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 "compat.h"
 #include <linux/videodev.h>
-- 
cgit v1.2.3