[PARPORT] 2.4.4 broken parport_pc.c as module on non-PCI machine

From: Felix Odenkirchen (F.Odenkirchen@gmx.net)
Date: Sat Apr 28 2001 - 18:18:35 EDT

  • Next message: Guy Forssman: "[PARPORT] HP7500e external cdwriter"

    Hi all!
    Compiling plain 2.4.4 kernel on a i486 with_out_ PCI support, I encountered the following error with PC parallel port as a module:

    parport_pc.c: In function `parport_pc_find_ports':
    parport_pc.c:2618: too many arguments to function `parport_pc_init_superio'
    make[2]: *** [parport_pc.o] Error 1
    make[1]: *** [_modsubdir_parport] Error 2
    make: *** [_mod_drivers] Error 2

    This was caused by a non-pci substitute for __init parport_pc_init_superio which lacked the proper argument definitions. I tried to add those, and it compiled just fine for me.
    Therefor I proposed the appended fix.
    Any comments are welcome and encouraged, please CC me.
    /Felix

    diff -urN linux.vanilla/drivers/parport/parport_pc.c linux/drivers/parport/parport_pc.c
    --- linux.vanilla/drivers/parport/parport_pc.c Sat Apr 21 01:23:12 2001
    +++ linux/drivers/parport/parport_pc.c Sat Apr 28 19:27:22 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) */

    -- 
    +----------------------------------------------------------------------+
         F.Odenkirchen@gmx.net        http://www.uni-karlsruhe.de/~ugyb
    +----------------------------------------------------------------------+
    

    -- 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 : Sat Apr 28 2001 - 18:28:28 EDT