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>

14 files changed, 57 insertions, 15 deletions

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>
diff --git a/linux/drivers/usb/media/em2820-cards.c b/linux/drivers/usb/media/em2820-cards.c
index 9955b7dc5..d9014eb89 100644
--- a/linux/drivers/usb/media/em2820-cards.c
+++ b/linux/drivers/usb/media/em2820-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/usb/media/em2820-core.c b/linux/drivers/usb/media/em2820-core.c
index 2da7ce029..b7beacf23 100644
--- a/linux/drivers/usb/media/em2820-core.c
+++ b/linux/drivers/usb/media/em2820-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/usb/media/em2820-i2c.c b/linux/drivers/usb/media/em2820-i2c.c
index 6eada9943..e1506d92b 100644
--- a/linux/drivers/usb/media/em2820-i2c.c
+++ b/linux/drivers/usb/media/em2820-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/usb/media/em2820-video.c b/linux/drivers/usb/media/em2820-video.c
index d5edcfe1b..18a8b0039 100644
--- a/linux/drivers/usb/media/em2820-video.c
+++ b/linux/drivers/usb/media/em2820-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/include/linux/videodev.h b/linux/include/linux/videodev.h
index c68d0ea09..d2d8928ec 100644
--- a/linux/include/linux/videodev.h
+++ b/linux/include/linux/videodev.h
@@ -6,7 +6,6 @@
 
 #define HAVE_V4L2 1
 #include <linux/videodev2.h>
-#include "compat.h"
 
 #ifdef __KERNEL__
 
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 1684ad3d3..5c9ae3e10 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,29 @@
+2005-10-08 20:03  mchehab
+	
+	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/Makefile:
+	- 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>
+
 2005-10-08 17:02  mkrufky
 
 	* v4l1-compat.c: (v4l_compat_translate_ioctl):
diff --git a/v4l/Makefile b/v4l/Makefile
index f2918c1eb..13318d519 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -130,6 +130,7 @@ DEST		:= /lib/modules/$(KERNELRELEASE)/$(MDIR)
 KDIR26		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/media
 KDIRUSB         := /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media
 
+CPPFLAGS := -I$(SUBDIRS)/../linux/include $(CPPFLAGS)
 
 # which files to install?
 inst-m		:= $(wildcard *.ko)
@@ -154,7 +155,14 @@ v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
 LC_ALL = POSIX
 export LC_ALL
 
-default:: linux media
+default::
+	find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
+	find ../linux/kernel/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
+
+#	find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \;
+
+	ln -sf ../linux/drivers/media/common/ir-common.c .
+
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
 
 
@@ -212,11 +220,13 @@ rmmodules::
 	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
 
 clean::
+	find . -name '*.c' -type l -exec rm '{}' \;
+	find . -name '*.h' -type l -exec rm '{}' \;
 	-rm -f *~ *.o *.ko *.mod.c
-	-rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
 
 linux media:
-	ln -s . $@
+	-rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
+	-rm -rf .tmp_versions
 
 #################################################
 # build tarballs
diff --git a/v4l/scripts/prepare-ChangeLog.pl b/v4l/scripts/prepare-ChangeLog.pl
index 1e5d2e743..a479c6999 100644
--- a/v4l/scripts/prepare-ChangeLog.pl
+++ b/v4l/scripts/prepare-ChangeLog.pl
@@ -90,7 +90,7 @@ close OLD_CHANGE_LOG;
 print STDERR "  Running cvs diff to find changes.\n";
 my %changed_line_ranges;
 my $file;
-open DIFF, "cvs -fq diff -N |" or die "The cvs diff failed: $OS_ERROR.\n";
+open DIFF, "cvs -fq diff -N ..|" or die "The cvs diff failed: $OS_ERROR.\n";
 while (<DIFF>)
   {
     $file = $1 if /^Index: (\S+)$/;