[PATCH] airo (was: Re: Linux 2.6.0-test4)

From: Geert Uytterhoeven (geert_at_linux-m68k.org)
Date: 08/24/03

  • Next message: David S. Miller: "Re: [PATCH 2.6.0-test4][NET] sk_mca.c: fix linker error" 
    Date:	Sun, 24 Aug 2003 13:39:39 +0200 (MEST)
To: Javier Achirica <achirica@telefonica.net>

    On Fri, 22 Aug 2003, Linus Torvalds wrote:
    > Javier Achirica:
    > o [wireless airo] Fix PCI unregister code

    This patch causes a regression: if CONFIG_PCI is not set, it doesn't compile
    anymore. Here's a fix. I also killed a dead variable and its corresponding
    warning:

    --- linux-2.6.0-test4/drivers/net/wireless/airo.c Sun Aug 24 09:49:30 2003
    +++ linux-m68k-2.6.0-test4/drivers/net/wireless/airo.c Sun Aug 24 13:03:56 2003
    @@ -4156,7 +4156,7 @@
     
     static int __init airo_init_module( void )
     {
    - int i, rc = 0, have_isa_dev = 0;
    + int i, have_isa_dev = 0;
     
             airo_entry = create_proc_entry("aironet",
                                            S_IFDIR | airo_perm,
    @@ -4174,7 +4174,7 @@
     
     #ifdef CONFIG_PCI
             printk( KERN_INFO "airo: Probing for PCI adapters\n" );
    - rc = pci_module_init(&airo_driver);
    + pci_module_init(&airo_driver);
             printk( KERN_INFO "airo: Finished probing for PCI adapters\n" );
     #endif
     
    @@ -4197,8 +4197,11 @@
             }
             remove_proc_entry("aironet", proc_root_driver);
     
    - if (is_pci)
    + if (is_pci) {
    +#ifdef CONFIG_PCI
                     pci_unregister_driver(&airo_driver);
    +#endif
    + }
     }
     
     #ifdef WIRELESS_EXT

    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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
  • Next message: David S. Miller: "Re: [PATCH 2.6.0-test4][NET] sk_mca.c: fix linker error"

    Relevant Pages