From bf26c70f504763809544095c38f614bea587c3ac Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <devnull@localhost>
Date: Wed, 22 Jun 2005 15:51:46 +0000
Subject:         * .bp/2.6/v4l-driver-doc, doc/API.html:         - API.html
 added, pointing to V4L api at linuxtv.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---
 linux/Documentation/video4linux/API.html | 16 ++++++++++++++++
 v4l/.bp/2.6/v4l-driver-doc               |  4 +---
 v4l/ChangeLog                            | 14 ++++++++++----
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 linux/Documentation/video4linux/API.html

diff --git a/linux/Documentation/video4linux/API.html b/linux/Documentation/video4linux/API.html
new file mode 100644
index 000000000..441407b12
--- /dev/null
+++ b/linux/Documentation/video4linux/API.html
@@ -0,0 +1,16 @@
+<TITLE>V4L API</TITLE>
+<H1>Video For Linux APIs</H1>
+<table border=0>
+<tr>
+<td>
+<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L1_API.html>
+V4L original API</a>
+</td><td>
+Obsoleted by V4L2 API
+</td></tr><tr><td>
+<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API.html>
+V4L2 API</a>
+</td><td>
+Should be used for new projects
+</td></tr>
+</table>
diff --git a/v4l/.bp/2.6/v4l-driver-doc b/v4l/.bp/2.6/v4l-driver-doc
index 0bc362fdc..b981b1f4a 100644
--- a/v4l/.bp/2.6/v4l-driver-doc
+++ b/v4l/.bp/2.6/v4l-driver-doc
@@ -21,9 +21,7 @@ srcdiff	doc/CARDLIST.tuner	Documentation/video4linux/CARDLIST.tuner
 srcdiff	doc/CARDLIST.cx88	Documentation/video4linux/CARDLIST.cx88
 
 # API
-srcdiff /dev/null		Documentation/video4linux/API.html
-srcdiff doc/V4L1_API.html	Documentation/video4linux/V4L1_API.html
-srcdiff doc/V4L2_API.html	Documentation/video4linux/V4L2_API.html
+srcdiff doc/API.html		Documentation/video4linux/API.html
 
 # obsolete / fixme
 #srcdiff	doc/Specs		Documentation/video4linux/bttv/Specs
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a9be6d1e4..594906b39 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,11 +1,17 @@
+2005-06-22 15:50  mchehab
+	* .bp/2.6/v4l-driver-doc, doc/API.html:
+	- API.html added, pointing to V4L api at linuxtv.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-06-21 22:50  hhackmann
 	* tda1004x.c
-    - added this file (copy from linuxtv DVB project) 
-      to make DVB-T for saa7134 work.
+        - added this file (copy from linuxtv DVB project) 
+          to make DVB-T for saa7134 work.
 
 	* saa7134-dvb.c 
-    - don't turn off the xtal output of tda8274/75 in sleep mode.
-      This might crash the channel decoder.
+        - don't turn off the xtal output of tda8274/75 in sleep mode.
+          This might crash the channel decoder.
            
 	Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
 
-- 
cgit v1.2.3