linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: linux-parport@torque.net
Cc: Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: [PATCH] parport_pc_init_superio()
Date: Fri, 11 May 2001 10:24:13 +0200 (CEST)	[thread overview]
Message-ID: <Pine.LNX.4.05.10105111021570.1624-100000@callisto.of.borg> (raw)


Someone forgot to update parport_pc_init_superio() for CONFIG_PCI=n (found by
Richard Zidlicky, IIRC).

Patches against Linus' 2.4.5-pre1 and Alan's 2.4.4-ac6 below.

diff -urN linux-2.4.5-pre1/drivers/parport/parport_pc.c linux-m68k-2.4.5-pre1/drivers/parport/parport_pc.c
--- linux-2.4.5-pre1/drivers/parport/parport_pc.c	Sat Apr 28 20:21:49 2001
+++ linux-m68k-2.4.5-pre1/drivers/parport/parport_pc.c	Wed May  2 08:23:08 2001
@@ -2576,7 +2576,7 @@
 }
 #else
 static struct pci_driver parport_pc_pci_driver;
-static int __init parport_pc_init_superio(void) {return 0;}
+static int __init parport_pc_init_superio(int autoirq, int autodma) {return 0;}
 #endif /* CONFIG_PCI */
 
 /* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */

--- linux-2.4.4-ac6/drivers/parport/parport_pc.c	Wed May  9 09:20:02 2001
+++ m68k-2.4.4-ac6/drivers/parport/parport_pc.c	Fri May 11 10:16:37 2001
@@ -2718,7 +2718,7 @@
 
 #else
 static struct pci_driver parport_pc_pci_driver;
-static int __init parport_pc_init_superio(void) {return 0;}
+static int __init parport_pc_init_superio(int autoirq, int autodma) {return 0;}
 #endif
 
 /* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


                 reply	other threads:[~2001-05-11  8:26 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.05.10105111021570.1624-100000@callisto.of.borg \
    --to=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-parport@torque.net \
    /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).