r4309 - in dists/trunk/linux-2.6/debian: . patches-debian patches-debian/series

[Frederik Schüler]

Author: fschueler-guest
Date: 2005-10-05 22:06:57 +0000 (Wed, 05 Oct 2005)
New Revision: 4309

Added:
   dists/trunk/linux-2.6/debian/patches-debian/kernel-api-documentation-generation-fix.diff
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1
Log:
Fix documentation build using a backport from git.


Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-10-05 21:32:17 UTC (rev 4308)
+++ dists/trunk/linux-2.6/debian/changelog	2005-10-05 22:06:57 UTC (rev 4309)
@@ -20,6 +20,8 @@
   * [amd64] Added class and longclass descriptions for amd64 flavours.
   * [amd64] add amd64-tlb-flush-sigsegv-fix.patch: disable tlb flush
     filtering on smp systems to workaround processor errata.
+  * backport kernel-api-documentation-generation-fix.diff from git to fix
+    documentation build.
   * Added patch-2.6.13.1:
     - raw_sendmsg DoS (CAN-2005-2492)
     - 32bit sendmsg() flaw (CAN-2005-2490)

Added: dists/trunk/linux-2.6/debian/patches-debian/kernel-api-documentation-generation-fix.diff
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/kernel-api-documentation-generation-fix.diff	2005-10-05 21:32:17 UTC (rev 4308)
+++ dists/trunk/linux-2.6/debian/patches-debian/kernel-api-documentation-generation-fix.diff	2005-10-05 22:06:57 UTC (rev 4309)
@@ -0,0 +1,31 @@
+From: Martin Waitz <tali at admingilde.org>
+Date: Fri, 9 Sep 2005 20:10:17 +0000 (-0700)
+Subject:     [PATCH] DocBook: fix kernel-api documentation generation
+X-Git-Tag: v2.6.14-rc1
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9d01a82e46a8dd18233121a6bc140e5576649583
+
+  [PATCH] DocBook: fix kernel-api documentation generation
+  
+  This patch changes a macro definition so that kernel-doc can understand it.
+  
+  Signed-off-by: Martin Waitz <tali at admingilde.org>
+  Signed-off-by: Andrew Morton <akpm at osdl.org>
+  Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+---
+
+--- a/include/sound/pcm.h
++++ b/include/sound/pcm.h
+@@ -910,11 +910,10 @@ int snd_pcm_format_big_endian(snd_pcm_fo
+  * Returns 1 if the given PCM format is CPU-endian, 0 if
+  * opposite, or a negative error code if endian not specified.
+  */
+-/* int snd_pcm_format_cpu_endian(snd_pcm_format_t format); */
+ #ifdef SNDRV_LITTLE_ENDIAN
+-#define snd_pcm_format_cpu_endian	snd_pcm_format_little_endian
++#define snd_pcm_format_cpu_endian(format) snd_pcm_format_little_endian(format)
+ #else
+-#define snd_pcm_format_cpu_endian	snd_pcm_format_big_endian
++#define snd_pcm_format_cpu_endian(format) snd_pcm_format_big_endian(format)
+ #endif
+ int snd_pcm_format_width(snd_pcm_format_t format);			/* in bits */
+ int snd_pcm_format_physical_width(snd_pcm_format_t format);		/* in bits */

Modified: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1	2005-10-05 21:32:17 UTC (rev 4308)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1	2005-10-05 22:06:57 UTC (rev 4309)
@@ -25,4 +25,4 @@
 + amd64-tlb-flush-sigsegv-fix.patch
 + powerpc-apus.patch
 + patch-2.6.13.3
-
++ kernel-api-documentation-generation-fix.diff