diff --git a/debian/changelog b/debian/changelog index fbe36ea5a..327019336 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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) diff --git a/debian/patches-debian/kernel-api-documentation-generation-fix.diff b/debian/patches-debian/kernel-api-documentation-generation-fix.diff new file mode 100644 index 000000000..f89d6ea56 --- /dev/null +++ b/debian/patches-debian/kernel-api-documentation-generation-fix.diff @@ -0,0 +1,31 @@ +From: Martin Waitz +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 + Signed-off-by: Andrew Morton + Signed-off-by: Linus Torvalds +--- + +--- 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 */ diff --git a/debian/patches-debian/series/2.6.13-1 b/debian/patches-debian/series/2.6.13-1 index 5c23f2eef..166497e7b 100644 --- a/debian/patches-debian/series/2.6.13-1 +++ b/debian/patches-debian/series/2.6.13-1 @@ -25,4 +25,4 @@ + amd64-tlb-flush-sigsegv-fix.patch + powerpc-apus.patch + patch-2.6.13.3 - ++ kernel-api-documentation-generation-fix.diff