From patchwork Sun Mar 20 23:35:12 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Pawel Osciak <pawel@osciak.com>
X-Patchwork-Id: 646951
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2KNZNWP006994
	for <patchwork-media@patchwork.kernel.org>;
	Sun, 20 Mar 2011 23:35:23 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751752Ab1CTXfV (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Sun, 20 Mar 2011 19:35:21 -0400
Received: from mail-pw0-f46.google.com ([209.85.160.46]:62531 "EHLO
	mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751506Ab1CTXfV (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Sun, 20 Mar 2011 19:35:21 -0400
Received: by pwi15 with SMTP id 15so693171pwi.19
	for <linux-media@vger.kernel.org>;
	Sun, 20 Mar 2011 16:35:20 -0700 (PDT)
Received: by 10.142.218.16 with SMTP id q16mr2603444wfg.5.1300664120746;
	Sun, 20 Mar 2011 16:35:20 -0700 (PDT)
Received: from localhost.localdomain (c-24-4-33-58.hsd1.ca.comcast.net
	[24.4.33.58]) by mx.google.com with ESMTPS id
	m10sm6506958wfl.23.2011.03.20.16.35.19
	(version=TLSv1/SSLv3 cipher=OTHER);
	Sun, 20 Mar 2011 16:35:20 -0700 (PDT)
From: Pawel Osciak <pawel@osciak.com>
To: linux-media@vger.kernel.org
Cc: Pawel Osciak <pawel@osciak.com>
Subject: [PATCH] [media] Make 2.6.39 not 2.6.38 the version when
	Multi-planar API was added
Date: Sun, 20 Mar 2011 16:35:12 -0700
Message-Id: <1300664112-24910-1-git-send-email-pawel@osciak.com>
X-Mailer: git-send-email 1.7.4.1
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Sun, 20 Mar 2011 23:35:23 +0000 (UTC)


diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/v4l/compat.xml
index 4d74bf2..9f7cd4f 100644
--- a/Documentation/DocBook/v4l/compat.xml
+++ b/Documentation/DocBook/v4l/compat.xml
@@ -2354,9 +2354,12 @@ that used it. It was originally scheduled for removal in 2.6.35.
       </orderedlist>
     </section>
     <section>
-      <title>V4L2 in Linux 2.6.38</title>
+      <title>V4L2 in Linux 2.6.39</title>
       <orderedlist>
         <listitem>
+          <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
+        </listitem>
+        <listitem>
           <para>Multi-planar API added. Does not affect the compatibility of
           current drivers and applications. See
           <link linkend="planar-apis">multi-planar API</link>
@@ -2364,14 +2367,6 @@ that used it. It was originally scheduled for removal in 2.6.35.
         </listitem>
       </orderedlist>
     </section>
-    <section>
-      <title>V4L2 in Linux 2.6.39</title>
-      <orderedlist>
-        <listitem>
-          <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
-        </listitem>
-      </orderedlist>
-    </section>
 
     <section id="other">
       <title>Relation of V4L2 to other Linux multimedia APIs</title>
diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml
index ae7a069..a7fd76d 100644
--- a/Documentation/DocBook/v4l/v4l2.xml
+++ b/Documentation/DocBook/v4l/v4l2.xml
@@ -130,17 +130,8 @@ applications. -->
       <revision>
 	<revnumber>2.6.39</revnumber>
 	<date>2011-03-01</date>
-	<authorinitials>mcc</authorinitials>
-	<revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes.
-	</revremark>
-      </revision>
-
-      <revision>
-	<revnumber>2.6.38</revnumber>
-	<date>2011-01-16</date>
-	<authorinitials>po</authorinitials>
-	<revremark>Added the <link linkend="planar-apis">multi-planar API</link>.
-	</revremark>
+	<authorinitials>mcc, po</authorinitials>
+	<revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes. Added the <link linkend="planar-apis">multi-planar API</link>.</revremark>
       </revision>
 
       <revision>