linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Javier Achirica <achirica@telefonica.net>
Cc: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>,
	Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: [PATCH] airo (was: Re: Linux 2.6.0-test4)
Date: Sun, 24 Aug 2003 13:39:39 +0200 (MEST)	[thread overview]
Message-ID: <Pine.GSO.4.21.0308241249210.14076-100000@waterleaf.sonytel.be> (raw)
In-Reply-To: <Pine.LNX.4.44.0308221732170.4677-100000@home.osdl.org>

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



  parent reply	other threads:[~2003-08-24 11:39 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-08-23  0:48 Linux 2.6.0-test4 Linus Torvalds
2003-08-23  1:21 ` [PATCH] Fix cdrom error handling in 2.6 Erik Andersen
2003-08-23 12:26 ` Linux 2.6.0-test4 vlad
2003-08-23 15:31   ` Jeff Garzik
2003-08-23 15:33     ` William Scott Lockwood III
2003-08-25  5:43     ` vlad
2003-08-24 11:39 ` Geert Uytterhoeven [this message]
2003-08-24 21:00   ` [PATCH] airo (was: Re: Linux 2.6.0-test4) Javier Achirica
2003-08-24 11:47 ` [PATCH] vmlinux-*.lds " Geert Uytterhoeven
2003-08-24 11:51 ` [PATCH] macide " Geert Uytterhoeven
2003-08-24 12:20   ` Christoph Hellwig
2003-08-24 12:29     ` Geert Uytterhoeven
2003-08-25 21:00 ` [patch] 2.6.0-test4: sis190 doesn't compile with gcc 2.95 Adrian Bunk
2003-08-26 17:44   ` Jeff Garzik
2003-08-25 21:20 ` Linux 2.6.0-test4 insecure
2003-08-25 21:26   ` [PATCH] raceless request_region() fix (was Re: Linux 2.6.0-test4) insecure
2003-08-25 21:59     ` Jeff Garzik
2003-08-26  5:20       ` insecure
2003-08-25 22:56 ` Linux 2.6.0-test4 (compile statistics) John Cherry
2003-08-30  9:04 ` Linux 2.6.0-test4 Ralf Hildebrandt

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.GSO.4.21.0308241249210.14076-100000@waterleaf.sonytel.be \
    --to=geert@linux-m68k.org \
    --cc=achirica@telefonica.net \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    --subject='[PATCH] airo (was: Re: Linux 2.6.0-test4)' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox