Commit d798505b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] airo CONFIG_PCI=n build fix

From: Geert Uytterhoeven <geert@linux-m68k.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:
parent 067a2ed6
...@@ -4634,7 +4634,7 @@ static void __devexit airo_pci_remove(struct pci_dev *pdev) ...@@ -4634,7 +4634,7 @@ static void __devexit airo_pci_remove(struct pci_dev *pdev)
static int __init airo_init_module( void ) 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", airo_entry = create_proc_entry("aironet",
S_IFDIR | airo_perm, S_IFDIR | airo_perm,
...@@ -4652,7 +4652,7 @@ static int __init airo_init_module( void ) ...@@ -4652,7 +4652,7 @@ static int __init airo_init_module( void )
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
printk( KERN_INFO "airo: Probing for PCI adapters\n" ); 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" ); printk( KERN_INFO "airo: Finished probing for PCI adapters\n" );
#endif #endif
...@@ -4675,8 +4675,11 @@ static void __exit airo_cleanup_module( void ) ...@@ -4675,8 +4675,11 @@ static void __exit airo_cleanup_module( void )
} }
remove_proc_entry("aironet", proc_root_driver); remove_proc_entry("aironet", proc_root_driver);
if (is_pci) if (is_pci) {
#ifdef CONFIG_PCI
pci_unregister_driver(&airo_driver); pci_unregister_driver(&airo_driver);
#endif
}
} }
#ifdef WIRELESS_EXT #ifdef WIRELESS_EXT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment