[PARPORT] [PATCH] parport_pc_init_superio()

From: Geert Uytterhoeven (geert@linux-m68k.org)
Date: Fri May 11 2001 - 04:24:13 EDT

  • Next message: Matt Roberds: "Re: [PARPORT] Sandisk parallel port ImageMate, how it works."

    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

    --  To unsubscribe, send mail to: linux-parport-request@torque.net --
--  with the single word "unsubscribe" in the body of the message. --

    This archive was generated by hypermail 2b29 : Sun May 13 2001 - 11:47:13 EDT