* [PATCH 2.6 2/2] Fix documentation build failure
[not found] <20050214200017.GA29201@sirius.home>
@ 2005-02-14 20:10 ` Sergey Vlasov
0 siblings, 0 replies; only message in thread
From: Sergey Vlasov @ 2005-02-14 20:10 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-fbdev-devel
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
Hello!
In linux-2.6.11-rc4-bk2 building of the documentation (make htmldocs)
fails on "DOCPROC Documentation/DocBook/kernel-api.sgml" because of
these errors:
Error(/home/vsu/src/linux-2.6.11-rc4-bk2/include/linux/skbuff.h:936): cannot understand prototype: '#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB '
Error(/home/vsu/src/linux-2.6.11-rc4-bk2/drivers/video/fbmem.c:1265): cannot understand prototype: 'const char *global_mode_option; '
This patch fixes htmldocs build failure on drivers/video/fbmem.c.
I think this patch (or an equivalent one) should be merged before the
2.6.11 release.
Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
--- linux-2.6.11-rc4-bk2/drivers/video/fbmem.c.doc-build 2005-02-14 20:12:33 +0300
+++ linux-2.6.11-rc4-bk2/drivers/video/fbmem.c 2005-02-14 23:02:45 +0300
@@ -1261,9 +1261,6 @@ int fb_get_options(char *name, char **op
* Returns zero.
*
*/
-
-extern const char *global_mode_option;
-
int __init video_setup(char *options)
{
int i, global = 0;
@@ -1277,6 +1274,8 @@ int __init video_setup(char *options)
}
if (!global && !strstr(options, "fb:")) {
+ extern const char *global_mode_option;
+
global_mode_option = options;
global = 1;
}
--
Sergey Vlasov
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] only message in thread