Fix documentation build using a backport from git.
svn path=/dists/trunk/linux-2.6/; revision=4309
This commit is contained in:
parent
01f449cc55
commit
26d2f527e5
|
@ -20,6 +20,8 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low
|
|||
* [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)
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
From: Martin Waitz <tali@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@admingilde.org>
|
||||
Signed-off-by: Andrew Morton <akpm@osdl.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@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 */
|
|
@ -25,4 +25,4 @@
|
|||
+ amd64-tlb-flush-sigsegv-fix.patch
|
||||
+ powerpc-apus.patch
|
||||
+ patch-2.6.13.3
|
||||
|
||||
+ kernel-api-documentation-generation-fix.diff
|
||||
|
|
Loading…
Reference in New Issue