linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bernhard Rosenkraenzer <bero@redhat.de>
To: <linux-kernel@vger.kernel.org>
Cc: <alan@redhat.com>
Subject: [PATCH] MatroxFB support can't be compiled into kernel in 2.4.0-ac11
Date: Fri, 26 Jan 2001 14:29:59 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.30.0101261421550.29870-200000@bochum.redhat.de> (raw)

[-- Attachment #1: Type: TEXT/PLAIN, Size: 227 bytes --]

Subject says it all - works as a module, but can't be compiled into the
kernel because of duplicate definitions, caused by several files including
matroxfb_base.h which in turn defines global_disp.

Patch attached.

LLaP
bero


[-- Attachment #2: matroxfb patch --]
[-- Type: TEXT/PLAIN, Size: 848 bytes --]

--- linux/drivers/video/matrox/matroxfb_base.h.bero	Fri Jan 26 13:39:54 2001
+++ linux/drivers/video/matrox/matroxfb_base.h	Fri Jan 26 13:40:22 2001
@@ -589,7 +589,11 @@
 #else
 
 extern struct matrox_fb_info matroxfb_global_mxinfo;
+#ifdef MODULE
 struct display global_disp;
+#else
+extern struct display global_disp;
+#endif
 
 #define ACCESS_FBINFO(x) (matroxfb_global_mxinfo.x)
 #define ACCESS_FBINFO2(info, x) (matroxfb_global_mxinfo.x)
--- linux/drivers/video/matrox/matroxfb_base.c.bero	Fri Jan 26 13:40:40 2001
+++ linux/drivers/video/matrox/matroxfb_base.c	Fri Jan 26 13:41:29 2001
@@ -98,6 +98,10 @@
 #include <linux/matroxfb.h>
 #include <asm/uaccess.h>
 
+#ifndef MODULE
+struct display global_disp;
+#endif
+ 
 #ifdef CONFIG_PPC
 unsigned char nvram_read_byte(int);
 static int default_vmode = VMODE_NVRAM;

                 reply	other threads:[~2001-01-26 13:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.30.0101261421550.29870-200000@bochum.redhat.de \
    --to=bero@redhat.de \
    --cc=alan@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).