From d798505b0593767ed44707c7a117bd736e503722 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 31 Aug 2003 04:28:52 -0700 Subject: [PATCH] [PATCH] airo CONFIG_PCI=n build fix From: Geert Uytterhoeven 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: --- drivers/net/wireless/airo.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index db423f303e1bd..02362e27c7aeb 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -4634,7 +4634,7 @@ static void __devexit airo_pci_remove(struct pci_dev *pdev) 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, @@ -4652,7 +4652,7 @@ static int __init airo_init_module( void ) #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 @@ -4675,8 +4675,11 @@ static void __exit airo_cleanup_module( void ) } 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 -- 2.53.0