public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Manfred Spraul <manfred@colorfullife.com>
To: davej@suse.de, linux-kernel@vger.kernel.org
Subject: agp compile error with 2.5.24-dj2
Date: Tue, 25 Jun 2002 21:02:57 +0200	[thread overview]
Message-ID: <3D18BE61.5040405@colorfullife.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

2.5.24-dj2 doesn't compile with my .config:
* the declaration of intel_i815_setup was missing in agp.h
* there is a superflous '+' in front of one line, probably a leftover 
from a manual merge.


Patch attach, but not tested.

--
	Manfred

[-- Attachment #2: patch-agp-dj2 --]
[-- Type: text/plain, Size: 1235 bytes --]

diff -u 2.5/drivers/char/agp/agp.h build-2.5/drivers/char/agp/agp.h
--- 2.5/drivers/char/agp/agp.h	Tue Jun 25 20:28:04 2002
+++ build-2.5/drivers/char/agp/agp.h	Tue Jun 25 20:46:26 2002
@@ -53,6 +53,7 @@
 int __init intel_i460_setup (struct pci_dev *pdev);
 int __init intel_generic_setup (struct pci_dev *pdev);
 int __init intel_i810_setup(struct pci_dev *i810_dev);
+int __init intel_815_setup(struct pci_dev *pdev);
 int __init intel_i830_setup(struct pci_dev *i830_dev);
 int __init intel_820_setup (struct pci_dev *pdev);
 int __init intel_830mp_setup (struct pci_dev *pdev);
diff -u 2.5/drivers/char/agp/agpgart_be-i8x0.c build-2.5/drivers/char/agp/agpgart_be-i8x0.c
--- 2.5/drivers/char/agp/agpgart_be-i8x0.c	Tue Jun 25 20:28:04 2002
+++ build-2.5/drivers/char/agp/agpgart_be-i8x0.c	Tue Jun 25 20:49:42 2002
@@ -438,7 +438,7 @@
 	{0x00000017, 0}
 };
 
-+static aper_size_info_8 intel_815_sizes[2] =
+static aper_size_info_8 intel_815_sizes[2] =
 {
 	{64, 16384, 4, 0},
 	{32, 8192, 3, 8},
@@ -507,7 +507,7 @@
 	(void) pdev; /* unused */
 }
 
-static int __init intel_815_setup (struct pci_dev *pdev)
+int __init intel_815_setup (struct pci_dev *pdev)
 {
 	agp_bridge.masks = intel_generic_masks;
 	agp_bridge.num_of_masks = 1;

                 reply	other threads:[~2002-06-25 19:02 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=3D18BE61.5040405@colorfullife.com \
    --to=manfred@colorfullife.com \
    --cc=davej@suse.de \
    --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