summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile13
-rw-r--r--linux/drivers/media/video/cx88/cx88-core.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88.h4
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-core.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-i2c.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx.h1
-rw-r--r--linux/drivers/usb/media/em2820-core.c2
-rw-r--r--linux/drivers/usb/media/em2820-i2c.c2
-rw-r--r--linux/drivers/usb/media/em2820-video.c2
-rw-r--r--linux/drivers/usb/media/em2820.h1
-rw-r--r--v4l/ChangeLog18
-rw-r--r--v4l/scripts/prepare-ChangeLog.pl2
13 files changed, 38 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index ff2040bd0..7f945ed3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
BUILD_DIR := $(shell pwd)/v4l
+ifeq ($(EDITOR),)
+ ifeq ($(VISUAL),)
+ EDITOR := vi
+ else
+ EDITOR := $(VISUAL)
+ endif
+endif
+
all:
install:
@@ -7,3 +15,8 @@ install:
%::
$(MAKE) -C $(BUILD_DIR) $(MAKECMDGOALS)
+
+changelog:
+ cvs update
+ cd $(BUILD_DIR); scripts/prepare-ChangeLog.pl; cd ..
+ $(EDITOR) v4l/ChangeLog
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index 669a457af..72cbf9d6b 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-core.c,v 1.42 2005/09/11 04:58:14 mkrufky Exp $
+ * $Id: cx88-core.c,v 1.43 2005/10/09 03:35:25 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* driver core
@@ -33,7 +33,7 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include "compat.h"
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include "cx88.h"
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 5036f62cb..757614cbf 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
/*
- * $Id: cx88.h,v 1.82 2005/10/05 04:19:55 mkrufky Exp $
+ * $Id: cx88.h,v 1.83 2005/10/09 03:35:25 mchehab Exp $
*
* v4l2 device driver for cx2388x based TV cards
*
@@ -23,7 +23,7 @@
#include <linux/pci.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include <linux/kdev_t.h>
#include <media/tuner.h>
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index b7beacf23..4bc4b4c6c 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c
@@ -28,8 +28,6 @@
#include <linux/moduleparam.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 e1506d92b..ae794bdee 100644
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c
@@ -26,8 +26,6 @@
#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 18a8b0039..eddabdd00 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -28,8 +28,6 @@
#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.h b/linux/drivers/media/video/em28xx/em28xx.h
index 7ea43f6cb..b60ef31f1 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -25,6 +25,7 @@
#ifndef _EM2820_H
#define _EM2820_H
+#include "compat.h"
#include <linux/videodev.h>
#include <linux/i2c.h>
diff --git a/linux/drivers/usb/media/em2820-core.c b/linux/drivers/usb/media/em2820-core.c
index b7beacf23..4bc4b4c6c 100644
--- a/linux/drivers/usb/media/em2820-core.c
+++ b/linux/drivers/usb/media/em2820-core.c
@@ -28,8 +28,6 @@
#include <linux/moduleparam.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 e1506d92b..ae794bdee 100644
--- a/linux/drivers/usb/media/em2820-i2c.c
+++ b/linux/drivers/usb/media/em2820-i2c.c
@@ -26,8 +26,6 @@
#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 18a8b0039..eddabdd00 100644
--- a/linux/drivers/usb/media/em2820-video.c
+++ b/linux/drivers/usb/media/em2820-video.c
@@ -28,8 +28,6 @@
#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.h b/linux/drivers/usb/media/em2820.h
index 7ea43f6cb..b60ef31f1 100644
--- a/linux/drivers/usb/media/em2820.h
+++ b/linux/drivers/usb/media/em2820.h
@@ -25,6 +25,7 @@
#ifndef _EM2820_H
#define _EM2820_H
+#include "compat.h"
#include <linux/videodev.h>
#include <linux/i2c.h>
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 42a3365c0..8f6fa3b7c 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,21 @@
+2005-10-09 03:31 mchehab
+
+ * ../Makefile:
+ - created make changelog to make easier to generate patches.
+
+ * ../linux/drivers/media/video/cx88/cx88-core.c:
+ * ../linux/drivers/media/video/cx88/cx88.h:
+ * ../linux/kernel/drivers/usb/media/em2820-core.c:
+ * ../linux/kernel/drivers/usb/media/em2820-i2c.c:
+ * ../linux/kernel/drivers/usb/media/em2820-video.c:
+ * ../linux/kernel/drivers/usb/media/em2820.h:
+ - removed unneccessary includes.
+
+ * ../v4l/scripts/prepare-ChangeLog.pl:
+ - Modified to avoid detecting ChangeLog as a change.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-10-08 03:24 mkrufky
* ../v4l/scripts/merge-trees.sh:
diff --git a/v4l/scripts/prepare-ChangeLog.pl b/v4l/scripts/prepare-ChangeLog.pl
index a479c6999..f464d7573 100644
--- a/v4l/scripts/prepare-ChangeLog.pl
+++ b/v4l/scripts/prepare-ChangeLog.pl
@@ -95,7 +95,7 @@ while (<DIFF>)
{
$file = $1 if /^Index: (\S+)$/;
if (defined $file
- and $file ne "ChangeLog"
+ and $file ne "../v4l/ChangeLog"
and (/^\d+(,\d+)?[acd](\d+)(,(\d+))?/ or /^Binary files/) )
{
push @{$changed_line_ranges{$file}}, [ $2, $4 || $2 ];
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 10:42:18 +0000